moved win_gtk.h header to wx/gtk/private, it's for internal use only

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

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index 7326c9ca8a07fc41cd990337f366ff323df0a674..c48663d7fd1a2b51dfea0eb88259ccb3d10a67d5 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -276,16 +276,11 @@ wxCursor::wxCursor( const wxImage &image )
 #endif
 }
 
 #endif
 }
 

-wxCursor::wxCursor(const char **bits)
+wxCursor::wxCursor(const char* const* bits)

 {
     (void) CreateFromXpm(bits);
 }
 
 {
     (void) CreateFromXpm(bits);
 }
 

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

 wxGDIRefData *wxCursor::CreateGDIRefData() const
 {
     return new wxCursorRefData;
 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));
 }
 
     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") );
 {
 #if wxUSE_IMAGE
     wxCHECK_MSG( bits != NULL, false, wxT("invalid cursor data") );


@@ -694,7 +689,9 @@ wxCursor::~wxCursor()
 }
 
 // Global cursor setting
 }
 
 // Global cursor setting

+wxCursor gGlobalCursor;

 void wxSetCursor(const wxCursor& cursor)
 {
     cursor.MacInstall() ;
 void wxSetCursor(const wxCursor& cursor)
 {
     cursor.MacInstall() ;

+    gGlobalCursor = cursor;

 }
 }