Removed rarely-used cursor; replaced other cursors

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

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 \

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

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"

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