renaming because of conflicts with base Create::

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/cursor.h b/include/wx/mac/cursor.h
index 05355d131c463c7f5aaccd1eab890bda16edbb84..b4088cc0fc7714da18053e4e52f5709dd8a3b7b7 100644 (file)
--- a/include/wx/mac/cursor.h
+++ b/include/wx/mac/cursor.h
@@ -74,7 +74,7 @@ public:
   void SetHCURSOR(WXHCURSOR cursor);
   inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
 private :
   void SetHCURSOR(WXHCURSOR cursor);
   inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
 private :

-    void Create(const wxImage & image) ;
+    void CreateFromImage(const wxImage & image) ;

 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index f847f34161299643283737e7af9328aa762a8fd9..ad1d54abb0a133b48ec5c39e317cca3917ca033f 100644 (file)
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -81,10 +81,10 @@ wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSE
 
 wxCursor::wxCursor( const wxImage &image )
 {
 
 wxCursor::wxCursor( const wxImage &image )
 {

-    Create( image ) ;
+    CreateFromImage( image ) ;

 }
 
 }
 

-void wxCursor::Create(const wxImage & image) 
+void wxCursor::CreateFromImage(const wxImage & image) 

 {
     m_refData = new wxCursorRefData;
 
 {
     m_refData = new wxCursorRefData;
 


@@ -187,7 +187,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
             image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ;
             image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
             delete m_refData ;
             image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ;
             image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
             delete m_refData ;

-            Create(image) ;
+            CreateFromImage(image) ;

         }
     }
 }
         }
     }
 }

diff --git a/src/mac/cursor.cpp b/src/mac/cursor.cpp
index f847f34161299643283737e7af9328aa762a8fd9..ad1d54abb0a133b48ec5c39e317cca3917ca033f 100644 (file)
--- a/src/mac/cursor.cpp
+++ b/src/mac/cursor.cpp
@@ -81,10 +81,10 @@ wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSE
 
 wxCursor::wxCursor( const wxImage &image )
 {
 
 wxCursor::wxCursor( const wxImage &image )
 {

-    Create( image ) ;
+    CreateFromImage( image ) ;

 }
 
 }
 

-void wxCursor::Create(const wxImage & image) 
+void wxCursor::CreateFromImage(const wxImage & image) 

 {
     m_refData = new wxCursorRefData;
 
 {
     m_refData = new wxCursorRefData;
 


@@ -187,7 +187,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
             image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ;
             image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
             delete m_refData ;
             image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ;
             image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
             delete m_refData ;

-            Create(image) ;
+            CreateFromImage(image) ;

         }
     }
 }
         }
     }
 }