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

Compilation fix for !WXWIN_COMPATIBILITY_2_4.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2004-01-31 18:23:50 +00:00
parent 584ad2a32f
commit 1a81dc1255
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,8 +138,8 @@ void wxCursor::CreateFromImage(const wxImage & image)
int h = image16.GetHeight() ; int h = image16.GetHeight() ;
bool bHasMask = image16.HasMask() ; bool bHasMask = image16.HasMask() ;
int hotSpotX = image16.GetOptionInt(wxCUR_HOTSPOT_X); int hotSpotX = image16.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
int hotSpotY = image16.GetOptionInt(wxCUR_HOTSPOT_Y); int hotSpotY = image16.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
if (hotSpotX < 0 || hotSpotX >= w) if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0; hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h) if (hotSpotY < 0 || hotSpotY >= h)
@@ -327,8 +327,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
image.LoadFile( cursor_file , flags ) ; image.LoadFile( cursor_file , flags ) ;
if( image.Ok() ) if( image.Ok() )
{ {
image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ; image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,hotSpotX ) ;
image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ; image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,hotSpotY ) ;
delete m_refData ; delete m_refData ;
CreateFromImage(image) ; CreateFromImage(image) ;
} }

8
src/mac/cursor.cpp
View File

@@ -138,8 +138,8 @@ void wxCursor::CreateFromImage(const wxImage & image)
int h = image16.GetHeight() ; int h = image16.GetHeight() ;
bool bHasMask = image16.HasMask() ; bool bHasMask = image16.HasMask() ;
int hotSpotX = image16.GetOptionInt(wxCUR_HOTSPOT_X); int hotSpotX = image16.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
int hotSpotY = image16.GetOptionInt(wxCUR_HOTSPOT_Y); int hotSpotY = image16.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
if (hotSpotX < 0 || hotSpotX >= w) if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0; hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h) if (hotSpotY < 0 || hotSpotY >= h)
@@ -327,8 +327,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
image.LoadFile( cursor_file , flags ) ; image.LoadFile( cursor_file , flags ) ;
if( image.Ok() ) if( image.Ok() )
{ {
image.SetOption(wxCUR_HOTSPOT_X,hotSpotX ) ; image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,hotSpotX ) ;
image.SetOption(wxCUR_HOTSPOT_Y,hotSpotY ) ; image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,hotSpotY ) ;
delete m_refData ; delete m_refData ;
CreateFromImage(image) ; CreateFromImage(image) ;
} }