fix wxTextCtrl::operator<<('\n') in Unicode build (should use char overload, not...

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

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 7326c9ca8a07fc41cd990337f366ff323df0a674..9ed8d0234a57ae30b734f7b1114660329fbaa47f 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -276,16 +276,11 @@ wxCursor::wxCursor( const wxImage &image )
 #endif
 }
 
-wxCursor::wxCursor(const char **bits)
+wxCursor::wxCursor(const char* const* bits)
 {
     (void) CreateFromXpm(bits);
 }
 
-wxCursor::wxCursor(char **bits)
-{
-    (void) CreateFromXpm((const char **)bits);
-}
-
 wxGDIRefData *wxCursor::CreateGDIRefData() const
 {
     return new wxCursorRefData;
@@ -296,7 +291,7 @@ wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
     return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data));
 }
 
-bool wxCursor::CreateFromXpm(const char **bits)
+bool wxCursor::CreateFromXpm(const char* const* bits)
 {
 #if wxUSE_IMAGE
     wxCHECK_MSG( bits != NULL, false, wxT("invalid cursor data") );
@@ -462,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) =
@@ -694,7 +689,9 @@ wxCursor::~wxCursor()
 }
 
 // Global cursor setting
+wxCursor gGlobalCursor;
 void wxSetCursor(const wxCursor& cursor)
 {
     cursor.MacInstall() ;
+    gGlobalCursor = cursor;
 }