Change wxNotebook selection before sending page changed event in wxMSW.

[wxWidgets.git] / src / osx / carbon / cursor.cpp

diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp
index 0da3c2ab2f18da0a2425c217fc5b387a9aaae7da..995e08b846f11ab1159f2ce16455b7f8fada2a45 100644 (file)
--- a/src/osx/carbon/cursor.cpp
+++ b/src/osx/carbon/cursor.cpp
@@ -196,6 +196,14 @@ ClassicCursor gMacCursors[kwxCursorLast+1] =
 {0x000A, 0x0006}
 },
 
 {0x000A, 0x0006}
 },
 

+{
+{0x07E0, 0x07E0, 0x07E0, 0x07E0, 0x0810, 0x1088, 0x1088, 0x1088,
+0x1388, 0x1008, 0x1008, 0x0810, 0x07E0, 0x07E0, 0x07E0, 0x07E0},
+{0x07E0, 0x07E0, 0x07E0, 0x07E0, 0x0FF0, 0x1FF8, 0x1FF8, 0x1FF8,
+0x1FF8, 0x1FF8, 0x1FF8, 0x0FF0, 0x07E0, 0x07E0, 0x07E0, 0x07E0},
+{0x0008, 0x0008}
+},
+    

 };
 
 #endif
 };
 
 #endif


@@ -231,14 +239,14 @@ wxCursorRefData::wxCursorRefData()
 #endif
 }
 
 #endif
 }
 

-wxCursorRefData::wxCursorRefData(const wxCursorRefData& cursor)
+wxCursorRefData::wxCursorRefData(const wxCursorRefData& cursor) : wxGDIRefData()

 {
 {

-    // FIXME: need to copy the cursor

     m_hCursor = NULL;
 
 #if wxOSX_USE_COCOA
     m_hCursor = NULL;
 
 #if wxOSX_USE_COCOA

-    wxUnusedVar(cursor);
+    m_hCursor = (WX_NSCursor) wxMacCocoaRetain(cursor.m_hCursor);

 #elif wxOSX_USE_CARBON
 #elif wxOSX_USE_CARBON

+    // FIXME: need to copy the cursor

     m_disposeHandle = false;
     m_releaseHandle = false;
     m_isColorCursor = cursor.m_isColorCursor;
     m_disposeHandle = false;
     m_releaseHandle = false;
     m_isColorCursor = cursor.m_isColorCursor;


@@ -281,11 +289,6 @@ wxCursor::wxCursor( const wxImage &image )
 #endif
 }
 
 #endif
 }
 

-wxCursor::wxCursor(const char* const* bits)
-{
-    (void) CreateFromXpm(bits);
-}
-

 wxGDIRefData *wxCursor::CreateGDIRefData() const
 {
     return new wxCursorRefData;
 wxGDIRefData *wxCursor::CreateGDIRefData() const
 {
     return new wxCursorRefData;