From 1a81dc12559d4277a9121b95e362515dc270235d Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 31 Jan 2004 18:23:50 +0000 Subject: [PATCH] Compilation fix for !WXWIN_COMPATIBILITY_2_4. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/cursor.cpp | 8 ++++---- src/mac/cursor.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp index 1200fb9c69..b780a675c9 100644 --- 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) @@ -327,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) ; } diff --git a/src/mac/cursor.cpp b/src/mac/cursor.cpp index 1200fb9c69..b780a675c9 100644 --- a/src/mac/cursor.cpp +++ b/src/mac/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) @@ -327,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) ; } -- 2.45.2