From: Robin Dunn Date: Thu, 25 Sep 2008 05:00:52 +0000 (+0000) Subject: More changes needed to fix problems resulting from unnecessary wxCursor changes :-( X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dd021ce2bd29a7e1d19b80995cd700828d5367c3 More changes needed to fix problems resulting from unnecessary wxCursor changes :-( git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index 559390b92e..4ed0a73b7f 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -27,7 +27,7 @@ public: int hotSpotX = -1, int hotSpotY = -1, const char maskBits[] = NULL); wxCursor(const wxString& name, - long flags = wxBITMAP_TYPE_CUR_RESOURCE, + wxBitmapType flags = wxBITMAP_TYPE_CUR_RESOURCE, int hotSpotX = 0, int hotSpotY = 0); wxCursor(wxStockCursor idCursor); virtual ~wxCursor(); diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 11515894a7..4010f812f6 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -231,7 +231,7 @@ wxCursor::wxCursor(const char WXUNUSED(bits)[], #ifdef __WXMICROWIN__ wxCursor::wxCursor(const wxString& WXUNUSED(filename), - long WXUNUSED(kind), + wxBitmapType WXUNUSED(kind), int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY)) { @@ -244,7 +244,7 @@ wxCursor::wxCursor(int WXUNUSED(cursor_type)) #else // !__WXMICROWIN__ wxCursor::wxCursor(const wxString& filename, - long kind, + wxBitmapType kind, int hotSpotX, int hotSpotY) {