cleanup in toplevel activation, and switching to native carbon event notification...

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

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index d6989138909682a871af9056b07771a08e389893..b780a675c9baa1f7ced9d82fc0052de733569aff 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -138,8 +138,8 @@ void wxCursor::CreateFromImage(const wxImage & image)
     int h = image16.GetHeight() ;
     bool bHasMask = image16.HasMask() ;
 
-       int hotSpotX = image16.GetOptionInt(wxCUR_HOTSPOT_X);
-    int hotSpotY = image16.GetOptionInt(wxCUR_HOTSPOT_Y);
+       int hotSpotX = image16.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+    int hotSpotY = image16.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
     if (hotSpotX < 0 || hotSpotX >= w)
             hotSpotX = 0;
     if (hotSpotY < 0 || hotSpotY >= h)
@@ -292,13 +292,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
     if ( flags == wxBITMAP_TYPE_MACCURSOR_RESOURCE )
     {
         Str255 theName ;
-
-    #if TARGET_CARBON
-        c2pstrcpy( (StringPtr) theName , cursor_file ) ;
-    #else
-        strcpy( (char *) theName , cursor_file ) ;
-        c2pstr( (char *) theName ) ;
-    #endif
+               wxMacStringToPascal( cursor_file , theName ) ;
         
         wxStAppResource resload ;
         Handle resHandle = ::GetNamedResource( 'crsr' , theName ) ;
@@ -333,8 +327,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
         image.LoadFile( cursor_file , flags ) ;
         if( image.Ok() )
         {
-            image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ;
-            image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
+            image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,hotSpotX ) ;
+            image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,hotSpotY ) ;
             delete m_refData ;
             CreateFromImage(image) ;
         }