Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaming because of conflicts with base Create::

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-01-16 06:53:32 +00:00
parent 22ab1509cd
commit ce72eadb4d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/mac/cursor.h
View File

@@ -74,7 +74,7 @@ public:
void SetHCURSOR(WXHCURSOR cursor); void SetHCURSOR(WXHCURSOR cursor);
inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); } inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
private : 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);

6
src/mac/carbon/cursor.cpp
View File

@@ -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_X,hotSpotX ) ;
image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ; image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
delete m_refData ; delete m_refData ;
Create(image) ; CreateFromImage(image) ;
} }
} }
} }

6
src/mac/cursor.cpp
View File

@@ -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_X,hotSpotX ) ;
image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ; image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ;
delete m_refData ; delete m_refData ;
Create(image) ; CreateFromImage(image) ;
} }
} }
} }