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 559390b92edfe710bba4eb34435b24d76d2d58b5..4ed0a73b7f8a1c4ea772d377e234cd6b557d3c82 100644 (file)
--- 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 11515894a76a751cc03b306c8beab65736cd311e..4010f812f6c6f65d1860f3c0a67040f1cde448c0 100644 (file)
--- 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)
 {