Empty string corrections.

[wxWidgets.git] / src / os2 / cursor.cpp

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index a3dddf55b8618bfa72d6058e184e5343dc995d70..f1b3bed9c22bb93e4af3c07aac66b246e8afacfa 100644 (file)
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -23,6 +23,7 @@
 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

+#include "wx/os2/wxrsc.h"

 #include "wx/image.h"
 
 #include "assert.h"
 #include "wx/image.h"
 
 #include "assert.h"


@@ -96,14 +97,12 @@ wxCursor::wxCursor(
 
 } // end of wxCursor::wxCursor
 
 
 } // end of wxCursor::wxCursor
 

-wxCursor::wxCursor(
-  const wxString&                   rsCursorFile
-, long                              lFlags
-, int                               nHotSpotX
-, int                               nHotSpotY
-)
+wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
+                    long lFlags,
+                    int WXUNUSED(nHotSpotX),
+                    int WXUNUSED(nHotSpotY) )

 {
 {

-    wxCursorRefData*                pRefData = new wxCursorRefData;
+    wxCursorRefData* pRefData = new wxCursorRefData;

 
     pRefData = new wxCursorRefData;
     m_refData = pRefData;
 
     pRefData = new wxCursorRefData;
     m_refData = pRefData;


@@ -134,6 +133,7 @@ wxCursor::wxCursor(
                                                                   );
             break;
 
                                                                   );
             break;
 

+        case wxCURSOR_WATCH:

         case wxCURSOR_WAIT:
             pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP
                                                                    ,(ULONG)SPTR_WAIT
         case wxCURSOR_WAIT:
             pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP
                                                                    ,(ULONG)SPTR_WAIT


@@ -219,10 +219,10 @@ wxCursor::wxCursor(
             break;
 
         case wxCURSOR_NO_ENTRY:
             break;
 
         case wxCURSOR_NO_ENTRY:

-            pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
-                                                               ,0
-                                                               ,(ULONG)wxCURSOR_NO_ENTRY
-                                                              );
+            pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP
+                                                                   ,(ULONG)SPTR_ILLEGAL
+                                                                   ,FALSE
+                                                                  );

             break;
 
         case wxCURSOR_LEFT_BUTTON:
             break;
 
         case wxCURSOR_LEFT_BUTTON:


@@ -253,13 +253,6 @@ wxCursor::wxCursor(
                                                                   );
             break;
 
                                                                   );
             break;
 

-        case wxCURSOR_WATCH:
-            pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
-                                                               ,0
-                                                               ,(ULONG)wxCURSOR_WATCH
-                                                              );
-            break;
-

         case wxCURSOR_SPRAYCAN:
             pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
                                                               ,0
         case wxCURSOR_SPRAYCAN:
             pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
                                                               ,0


@@ -329,4 +322,3 @@ void wxSetCursor(const wxCursor& cursor)
             (*g_globalCursor) = cursor;
     }
 }
             (*g_globalCursor) = cursor;
     }
 }

-