From: Julian Smart Date: Sun, 15 May 2005 16:43:12 +0000 (+0000) Subject: Removed rarely-used cursor; replaced other cursors X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9700085237bd77bb31bfa7a9e2d835fd2546473d?ds=sidebyside;hp=01f714f3bbf748710e455cdbcdb577894a102397 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 48a21da438..13fdb61e95 100644 --- 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 5e7e7ef835..afb089db9d 100644 --- 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 wx/msw/cdrom.ico wx/msw/child.ico diff --git a/include/wx/msw/bullseye.cur b/include/wx/msw/bullseye.cur index 308c07d332..42a1b9cd76 100644 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 b01ef9ca56..e5a1fe7c2f 100644 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 bb4c8978d6..15d1a77a49 100644 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 97212e3faa..59c09f171b 100644 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 231ed1e79f..9917b3f797 100644 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 222b25b864..e7192aab6d 100644 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 e9b6b5037e..565447b03c 100644 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 9e0e790661..c54c3ac4b0 100644 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 bb7f166133..118c37fa43 100644 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 index 323f01c3e5..0000000000 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 2adc464ac7..e0549a4be1 100644 --- 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 4dee125894..45a3edbfb7 100644 --- 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