X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/521bf4ff3ef47059265beff5d53c9e1162beb122..dad013ac0177be398b26236d5aa606a32d0a3356:/src/os2/cursor.cpp

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index 2bb61ca264..1f14052c8c 100644
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -12,18 +12,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/cursor.h"
-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/os2/private.h"
 #include "wx/os2/wxrsc.h"
-#include "wx/image.h"
 
 #include "assert.h"
 
@@ -52,15 +54,6 @@ wxCursor::wxCursor(void)
 {
 }
 
-wxCursor::wxCursor(const char WXUNUSED(bits)[],
-                   int WXUNUSED(width),
-                   int WXUNUSED(height),
-                   int WXUNUSED(hotSpotX),
-                   int WXUNUSED(hotSpotY),
-                   const char WXUNUSED(maskBits)[])
-{
-}
-
 wxCursor::wxCursor(const wxImage& rImage)
 {
     wxImage  vImage32 = rImage.Scale(32,32);
@@ -93,7 +86,7 @@ wxCursor::wxCursor(const wxImage& rImage)
 } // end of wxCursor::wxCursor
 
 wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
-                    long lFlags,
+                    wxBitmapType type,
                     int WXUNUSED(nHotSpotX),
                     int WXUNUSED(nHotSpotY) )
 {
@@ -102,17 +95,19 @@ wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
     pRefData = new wxCursorRefData;
     m_refData = pRefData;
     pRefData->m_bDestroyCursor = false;
-    if (lFlags == wxBITMAP_TYPE_CUR_RESOURCE)
+    if (type == wxBITMAP_TYPE_CUR_RESOURCE)
     {
         pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
                                                            ,0
-                                                           ,(ULONG)lFlags // if OS/2 this should be the resource Id
+                                                           ,(ULONG)type // if OS/2 this should be the resource Id
                                                           );
     }
+    else
+        wxLogError("Invalid cursor bitmap type '%d'", type);
 } // end of wxCursor::wxCursor
 
 // Cursors by stock number
-wxCursor::wxCursor(int nCursorType)
+void wxCursor::InitFromStock(wxStockCursor nCursorType)
 {
     wxCursorRefData*                pRefData = new wxCursorRefData;