From 3c203a185145a1aa720faf53e7f6fbebb35bce7a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 19 May 2005 20:39:06 +0000 Subject: [PATCH] Removed redundant cursor files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/noentry.ptr | Bin 996 -> 0 bytes include/wx/os2/watch.ptr | Bin 288 -> 0 bytes include/wx/os2/watch1.ptr | Bin 996 -> 0 bytes include/wx/os2/wx.rc | 2 -- src/os2/cursor.cpp | 16 +++++----------- 5 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 include/wx/os2/noentry.ptr delete mode 100644 include/wx/os2/watch.ptr delete mode 100644 include/wx/os2/watch1.ptr diff --git a/include/wx/os2/noentry.ptr b/include/wx/os2/noentry.ptr deleted file mode 100644 index 5079beaa429861fa7a5cbf82cbc4aa3d4c3c63f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 996 zcmc&yJ8r`;45jJdI&tfE=+Kt7 zL_R+9>0=*GM-h3%^9H}i*tic85H0O)nObBHH&ux2!Eby7xkvPK%WT1vJ;)9+5`Eu` zlEe?~pwyY(U-9swdr&M0HsXV`?B9}CV zp&grZ%UbJUFEyz3js4BRqv|kQDFSdzW?`I=AmW#~77WbTWF-d3dO;+Ocfv#E)N)K4 z9nDjKm^Ji{O=5k_0m}6SM`o3@L@Z3tJ1%zwq%kH^Y8v$F+1-In|$(^>r*7 z57X!Vy{I0tzK^M%Q&<0TJ6?y?ypO_sE-Lp1J0`$9?V%{R6+nWFi0n diff --git a/include/wx/os2/watch1.ptr b/include/wx/os2/watch1.ptr deleted file mode 100644 index 5088ff747923cb7c02758af167c8ef292aed4920..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 996 zcmc&x!Hohj44mbVc;-4dIsu9QiIP$p1#A&KC?HQBNM^?Na#>ag-3u>qJdVecn8WcG zz&F1O_dVA(_W=W=rLC5!S;ow8`0L6hd!BD|4Olb!zg1D_Y6dkyWnvshn9k`a?tvxH zZ9Z)`VAroJ@Y8^D1~w<)ORECIwD88JI_;=2)w|bH4CZq##u`~^oD_51!&o5e zVe1m+z^ueHRW07c5LC4s(>!is6n<(+uOBn|k*4tB)W#X<7r2DF%dw^Q#4{0dQ%T#V6%C`U(9|vZ%r^vY?*8M NFatjQpFCDR3hoFEbD#hK diff --git a/include/wx/os2/wx.rc b/include/wx/os2/wx.rc index 287cf8fa99..1a8570756a 100644 --- 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_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_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" diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp index c1d68f0ffe..b2413b0df2 100644 --- a/src/os2/cursor.cpp +++ b/src/os2/cursor.cpp @@ -135,6 +135,7 @@ wxCursor::wxCursor( ); break; + case wxCURSOR_WATCH: case wxCURSOR_WAIT: pRefData->m_hCursor = (WXHCURSOR) ::WinQuerySysPointer( HWND_DESKTOP ,(ULONG)SPTR_WAIT @@ -220,10 +221,10 @@ wxCursor::wxCursor( 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: @@ -254,13 +255,6 @@ wxCursor::wxCursor( ); 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