X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd021ce2bd29a7e1d19b80995cd700828d5367c3..592883ed7e594638de70a8afe2e35ee669e55440:/src/msw/cursor.cpp

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 4010f812f6..ec25d16d04 100644
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -106,7 +106,7 @@ public:
     virtual void OnExit()
     {
         delete gs_globalCursor;
-        gs_globalCursor = (wxCursor *)NULL;
+        gs_globalCursor = NULL;
     }
 };
 
@@ -219,25 +219,10 @@ wxCursor::wxCursor(const wxImage& image)
 }
 #endif // wxUSE_IMAGE
 
-wxCursor::wxCursor(const char WXUNUSED(bits)[],
-                   int WXUNUSED(width),
-                   int WXUNUSED(height),
-                   int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY),
-                   const char WXUNUSED(maskBits)[])
-{
-}
-
 // MicroWin doesn't have support needed for the other ctors
 #ifdef __WXMICROWIN__
 
-wxCursor::wxCursor(const wxString& WXUNUSED(filename),
-                   wxBitmapType WXUNUSED(kind),
-                   int WXUNUSED(hotSpotX),
-                   int WXUNUSED(hotSpotY))
-{
-}
-
-wxCursor::wxCursor(int WXUNUSED(cursor_type))
+wxCursor::InitFromStock(wxStockCursor WXUNUSED(cursor_type))
 {
 }
 
@@ -280,7 +265,7 @@ wxCursor::wxCursor(const wxString& filename,
             break;
 
         default:
-            wxFAIL_MSG( _T("unknown cursor resource type") );
+            wxLogError( _T("unknown cursor resource type '%d'"), kind );
 
             hcursor = NULL;
     }
@@ -292,7 +277,7 @@ wxCursor::wxCursor(const wxString& filename,
 }
 
 // Cursors by stock number
-wxCursor::wxCursor(wxStockCursor idCursor)
+void wxCursor::InitFromStock(wxStockCursor idCursor)
 {
     // all wxWidgets standard cursors
     static const struct StdCursor