Ensure popup menus can display sub-menus.

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

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 0b8e4c8a7bdee177e78d832678ee0a08a7bc0aab..9ed8d0234a57ae30b734f7b1114660329fbaa47f 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -457,7 +457,7 @@ void wxCursor::CreateFromImage(const wxImage & image)
 
                 maskbits |= ( 1 << (15 - x) ) ;
 
-                col = *((RGBColor*) wxColor( r , g , b ).GetPixel()) ;
+                wxColor( r , g , b ).GetRGBColor( &col );
             }
 
             *((*(**ch).crsrData) + y * bytesPerRow + x) =
@@ -689,7 +689,9 @@ wxCursor::~wxCursor()
 }
 
 // Global cursor setting
+wxCursor gGlobalCursor;
 void wxSetCursor(const wxCursor& cursor)
 {
     cursor.MacInstall() ;
+    gGlobalCursor = cursor;
 }