Skip to content
Snippets Groups Projects
Commit 79e79c2e authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Remove more deprecated macos api usage

parent fecf2c09
Branches
Tags
No related merge requests found
......@@ -95,7 +95,6 @@ void setCrossCursor();
void setNotAllowedCursor();
void hideNSCursor();
void showNSCursor();
bool isCGCursorVisible();
void hideNSCursorTillMove(bool hide);
void requestUserAttention();
long showAlert(std::string title, std::string text, int type);
......
......@@ -163,11 +163,6 @@ void showNSCursor()
[NSCursor unhide];
}
bool isCGCursorVisible()
{
return CGCursorIsVisible();
}
void hideNSCursorTillMove(bool hide)
{
[NSCursor setHiddenUntilMouseMoves:hide];
......
......@@ -1494,11 +1494,6 @@ void LLWindowMacOSX::updateCursor()
if(mCurrentCursor == mNextCursor)
{
if(mCursorHidden && mHideCursorPermanent && isCGCursorVisible())
{
hideNSCursor();
adjustCursorDecouple();
}
return;
}
......@@ -1713,12 +1708,6 @@ void LLSplashScreenMacOSX::showImpl()
void LLSplashScreenMacOSX::updateImpl(const std::string& mesg)
{
if(mWindow != NULL)
{
CFStringRef string = NULL;
string = CFStringCreateWithCString(NULL, mesg.c_str(), kCFStringEncodingUTF8);
}
}
......@@ -1813,32 +1802,6 @@ LLSD LLWindowMacOSX::getNativeKeyData()
BOOL LLWindowMacOSX::dialogColorPicker( F32 *r, F32 *g, F32 *b)
{
#if 0
BOOL retval = FALSE;
OSErr error = noErr;
NColorPickerInfo info;
memset(&info, 0, sizeof(info));
info.theColor.color.rgb.red = (UInt16)(*r * 65535.f);
info.theColor.color.rgb.green = (UInt16)(*g * 65535.f);
info.theColor.color.rgb.blue = (UInt16)(*b * 65535.f);
info.placeWhere = kCenterOnMainScreen;
error = NPickColor(&info);
if (error == noErr)
{
retval = info.newColorChosen;
if (info.newColorChosen)
{
*r = ((float) info.theColor.color.rgb.red) / 65535.0;
*g = ((float) info.theColor.color.rgb.green) / 65535.0;
*b = ((float) info.theColor.color.rgb.blue) / 65535.0;
}
}
return (retval);
#endif
return FALSE;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment