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

Rename Mac wxCursor::CreateFromImage() to InitFromImage()

Browse Source 
Use the same name as in the other ports for the function doing the same
thing, there doesn't seem to be any good reason to name it differently.

Also avoid declaring it when wxUSE_IMAGE==0 as it's not defined in this
case (again, consistently with the other ports).
This commit is contained in:
Vadim Zeitlin
2021-04-17 19:31:08 +01:00
parent b26fd44c77
commit 9c6e67cac0
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/osx/cursor.h
View File

@@ -44,7 +44,9 @@ protected:
private:
void InitFromStock(wxStockCursor);
void CreateFromImage(const wxImage & image) ;
#if wxUSE_IMAGE
void InitFromImage(const wxImage & image) ;
#endif // wxUSE_IMAGE
wxDECLARE_DYNAMIC_CLASS(wxCursor);
};

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

@@ -228,7 +228,7 @@ wxCursor::wxCursor()
#if wxUSE_IMAGE
wxCursor::wxCursor( const wxImage &image )
{
CreateFromImage( image ) ;
InitFromImage( image ) ;
}
#endif // wxUSE_IMAGE
@@ -249,7 +249,7 @@ WXHCURSOR wxCursor::GetHCURSOR() const
#if wxUSE_IMAGE
void wxCursor::CreateFromImage(const wxImage & image)
void wxCursor::InitFromImage(const wxImage & image)
{
m_refData = new wxCursorRefData;
int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
@@ -287,7 +287,7 @@ wxCursor::wxCursor(const wxString& cursor_file, wxBitmapType flags, int hotSpotX
image.SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY ) ;
m_refData->DecRef() ;
m_refData = NULL ;
CreateFromImage( image ) ;
InitFromImage( image ) ;
}
#endif
}