From 79e79c2e670a35ca0e70068bbf4c7b8cfa41de7c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 10 Nov 2020 18:45:10 -0500
Subject: [PATCH] Remove more deprecated macos api usage
---
indra/llwindow/llwindowmacosx-objc.h | 1 -
indra/llwindow/llwindowmacosx-objc.mm | 5 ----
indra/llwindow/llwindowmacosx.cpp | 37 ---------------------------
3 files changed, 43 deletions(-)
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h
index 44fd4127ce5..5d00301ce86 100644
--- a/indra/llwindow/llwindowmacosx-objc.h
+++ b/indra/llwindow/llwindowmacosx-objc.h
@@ -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);
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 44670008532..dfc77113a31 100644
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -163,11 +163,6 @@ void showNSCursor()
[NSCursor unhide];
}
-bool isCGCursorVisible()
-{
- return CGCursorIsVisible();
-}
-
void hideNSCursorTillMove(bool hide)
{
[NSCursor setHiddenUntilMouseMoves:hide];
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 0f8541ebc77..823f56512cc 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -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;
}
--
GitLab