Removed redundant cursor files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/noentry.ptr b/include/wx/os2/noentry.ptr
deleted file mode 100644 (file)
index 5079bea..0000000
Binary files a/include/wx/os2/noentry.ptr and /dev/null differ

diff --git a/include/wx/os2/watch.ptr b/include/wx/os2/watch.ptr
deleted file mode 100644 (file)
index d974fab..0000000
Binary files a/include/wx/os2/watch.ptr and /dev/null differ

diff --git a/include/wx/os2/watch1.ptr b/include/wx/os2/watch1.ptr
deleted file mode 100644 (file)
index 5088ff7..0000000
Binary files a/include/wx/os2/watch1.ptr and /dev/null differ

diff --git a/include/wx/os2/wx.rc b/include/wx/os2/wx.rc
index 287cf8fa99a6a2fc1ca5fe5c1307fe2c85d6d271..1a8570756a53cd6d2ee6f093e549b9e4a48ceb01 100644 (file)
--- a/include/wx/os2/wx.rc
+++ b/include/wx/os2/wx.rc
@@ -30,10 +30,8 @@ POINTER    WXCURSOR_HAND           LOADONCALL    "\\dev\\wx2\\wxwindows\\include
 POINTER    WXCURSOR_BULLSEYE       LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\bullseye.ptr"
 POINTER    WXCURSOR_PENCIL         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pencil.ptr"
 POINTER    WXCURSOR_MAGNIFIER      LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\magnit1.ptr"
 POINTER    WXCURSOR_BULLSEYE       LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\bullseye.ptr"
 POINTER    WXCURSOR_PENCIL         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pencil.ptr"
 POINTER    WXCURSOR_MAGNIFIER      LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\magnit1.ptr"

-POINTER    WXCURSOR_NO_ENTRY       LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\noentry.ptr"

 POINTER    WXCURSOR_SIZING         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\size.ptr"
 POINTER    WXCURSOR_ROLLER         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\roller.ptr"
 POINTER    WXCURSOR_SIZING         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\size.ptr"
 POINTER    WXCURSOR_ROLLER         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\roller.ptr"

-POINTER    WXCURSOR_WATCH          LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\watch.ptr"

 POINTER    WXCURSOR_PBRUSH         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pbrush.ptr"
 POINTER    WXCURSOR_PLEFT          LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntleft.ptr"
 POINTER    WXCURSOR_PRIGHT         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntright.ptr"
 POINTER    WXCURSOR_PBRUSH         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pbrush.ptr"
 POINTER    WXCURSOR_PLEFT          LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntleft.ptr"
 POINTER    WXCURSOR_PRIGHT         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntright.ptr"

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index c1d68f0ffe543b8b4b111f02d1a08c3921b46acb..b2413b0df2606d78c7afd9a90cafc4abe086fcd7 100644 (file)
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -135,6 +135,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


@@ -220,10 +221,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:


@@ -254,13 +255,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