Removed rarely-used cursor; replaced other cursors

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

diff --git a/Makefile.in b/Makefile.in
index 48a21da4385c654f2cdbba4068679ad6d380eaea..13fdb61e95943c125d36629530befe3f5164a686 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1952,7 +1952,6 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/pntright.cur \
        wx/msw/rightarr.cur \
        wx/msw/roller.cur \
-       wx/msw/watch1.cur \
        wx/msw/cdrom.ico \
        wx/msw/child.ico \
        wx/msw/computer.ico \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 5e7e7ef83563541b115b8ec08f73bf9c4529a680..afb089db9dc10e44190a40bd03f68c41d5587a0b 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1442,7 +1442,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/pntright.cur
     wx/msw/rightarr.cur
     wx/msw/roller.cur
-    wx/msw/watch1.cur
     <!-- icons -->
     wx/msw/cdrom.ico
     wx/msw/child.ico

diff --git a/include/wx/msw/bullseye.cur b/include/wx/msw/bullseye.cur
index 308c07d3325a0d7dc7b480cfd402abd7a25830f6..42a1b9cd76e891045bd82f16adba7688e0e249ee 100644 (file)
Binary files a/include/wx/msw/bullseye.cur and b/include/wx/msw/bullseye.cur differ

diff --git a/include/wx/msw/hand.cur b/include/wx/msw/hand.cur
index b01ef9ca5657383de3d31874f119b39688fcf0ce..e5a1fe7c2f5dd90249a5d60c1efe667188abd494 100644 (file)
Binary files a/include/wx/msw/hand.cur and b/include/wx/msw/hand.cur differ

diff --git a/include/wx/msw/magnif1.cur b/include/wx/msw/magnif1.cur
index bb4c8978d6ff06cf471120492e33ef0ec3aa5a9b..15d1a77a49a5053ba171d0c7fdf9937f131814e3 100644 (file)
Binary files a/include/wx/msw/magnif1.cur and b/include/wx/msw/magnif1.cur differ

diff --git a/include/wx/msw/pbrush.cur b/include/wx/msw/pbrush.cur
index 97212e3faad4bb1f28892269ee9bdfed99e70a85..59c09f171b43fa48562186deed20c92076a14ff3 100644 (file)
Binary files a/include/wx/msw/pbrush.cur and b/include/wx/msw/pbrush.cur differ

diff --git a/include/wx/msw/pencil.cur b/include/wx/msw/pencil.cur
index 231ed1e79f7bc3c1b4291024697607f58f1c91ba..9917b3f79701965e06cd74511194a87935c859d6 100644 (file)
Binary files a/include/wx/msw/pencil.cur and b/include/wx/msw/pencil.cur differ

diff --git a/include/wx/msw/pntleft.cur b/include/wx/msw/pntleft.cur
index 222b25b86408566858225dab95d0d8e78a86babc..e7192aab6da74893eab5c7df99cee017f6e6764e 100644 (file)
Binary files a/include/wx/msw/pntleft.cur and b/include/wx/msw/pntleft.cur differ

diff --git a/include/wx/msw/pntright.cur b/include/wx/msw/pntright.cur
index e9b6b5037eded13660d3ea0154f0de96463479a1..565447b03ce6794a2b117749ed87d17ce104b4f8 100644 (file)
Binary files a/include/wx/msw/pntright.cur and b/include/wx/msw/pntright.cur differ

diff --git a/include/wx/msw/rightarr.cur b/include/wx/msw/rightarr.cur
index 9e0e79066182455e5a01b60145f4c8b99ac4595c..c54c3ac4b09fa88728c865d94ae7665a35103f42 100644 (file)
Binary files a/include/wx/msw/rightarr.cur and b/include/wx/msw/rightarr.cur differ

diff --git a/include/wx/msw/roller.cur b/include/wx/msw/roller.cur
index bb7f16613384321a0a749dd94a669c8412bff613..118c37fa439da2836f547914c866d3ad0c003d64 100644 (file)
Binary files a/include/wx/msw/roller.cur and b/include/wx/msw/roller.cur differ

diff --git a/include/wx/msw/watch1.cur b/include/wx/msw/watch1.cur
deleted file mode 100644 (file)
index 323f01c..0000000
Binary files a/include/wx/msw/watch1.cur and /dev/null differ

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 2adc464ac759f494010a7e404165feec8f98e6ab..e0549a4be1b47f8a136c29c425dd35b12c592560 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -48,7 +48,6 @@ WXCURSOR_BULLSEYE       CURSOR  DISCARDABLE     "wx/msw/bullseye.cur"
 WXCURSOR_PENCIL         CURSOR  DISCARDABLE     "wx/msw/pencil.cur"
 WXCURSOR_MAGNIFIER      CURSOR  DISCARDABLE     "wx/msw/magnif1.cur"
 WXCURSOR_ROLLER         CURSOR  DISCARDABLE     "wx/msw/roller.cur"
-WXCURSOR_WATCH          CURSOR  DISCARDABLE     "wx/msw/watch1.cur"
 WXCURSOR_PBRUSH         CURSOR  DISCARDABLE     "wx/msw/pbrush.cur"
 WXCURSOR_PLEFT          CURSOR  DISCARDABLE     "wx/msw/pntleft.cur"
 WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 4dee125894752eae54b4ed9b8dcfcecbaaf7bac1..45a3edbfb795812c5edae806f4e201c246e0bae3 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -333,7 +333,7 @@ wxCursor::wxCursor(int idCursor)
         {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
         { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
         {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
-        { false, _T("WXCURSOR_WATCH")        }, // WXCURSOR_WATCH
+        {  true, IDC_WAIT                    }, // WXCURSOR_WATCH
         { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT