X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..d2c6d54928e7ba32b2bf6ddf0ca5f3dd4339758b:/src/mac/carbon/cursor.cpp

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index dee7c92b5f..fa0bbf76b2 100644
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -16,17 +16,33 @@
 #include "wx/cursor.h"
 #include "wx/icon.h"
 
+#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
+#endif
 
 const short kwxCursorHandId = 9 ;
 const short kwxCursorSizeWEId = 10 ;
 const short kwxCursorSizeNSId = 11 ;
+#if !TARGET_CARBON
 Cursor*		MacArrowCursorPtr = &qd.arrow ;
 CursHandle	MacArrowCursor = &MacArrowCursorPtr ;
+#else
+bool		MacArrowInstalled = false ;
+Cursor 		MacArrow ;
+Cursor*		MacArrowCursorPtr = &MacArrow ;
+CursHandle	MacArrowCursor = &MacArrowCursorPtr ;
+#endif
 CursHandle	gMacCurrentCursor = NULL ;
 
 wxCursorRefData::wxCursorRefData()
 {
+#if TARGET_CARBON
+	if ( !MacArrowInstalled )
+	{
+		MacArrowCursorPtr = GetQDGlobalsArrow( &MacArrow ) ;
+		MacArrowInstalled = true ;
+	}
+#endif
     m_width = 32; 
     m_height = 32;
     m_hCursor = NULL ;
@@ -34,8 +50,8 @@ wxCursorRefData::wxCursorRefData()
 
 wxCursorRefData::~wxCursorRefData()
 {
-	if ( m_hCursor && ( m_hCursor != MacArrowCursor ) )
-		::DisposeHandle( (Handle) m_hCursor ) ;
+//	if ( m_hCursor && ( m_hCursor != MacArrowCursor ) )
+//		::ReleaseResource( (Handle) m_hCursor ) ;
 }
 
 // Cursors