From 9700085237bd77bb31bfa7a9e2d835fd2546473d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 15 May 2005 16:43:12 +0000 Subject: [PATCH 1/1] 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 | 1 - build/bakefiles/files.bkl | 1 - include/wx/msw/bullseye.cur | Bin 326 -> 326 bytes include/wx/msw/hand.cur | Bin 326 -> 326 bytes include/wx/msw/magnif1.cur | Bin 326 -> 326 bytes include/wx/msw/pbrush.cur | Bin 326 -> 12 bytes include/wx/msw/pencil.cur | Bin 326 -> 134 bytes include/wx/msw/pntleft.cur | Bin 326 -> 326 bytes include/wx/msw/pntright.cur | Bin 326 -> 326 bytes include/wx/msw/rightarr.cur | Bin 326 -> 326 bytes include/wx/msw/roller.cur | Bin 326 -> 326 bytes include/wx/msw/watch1.cur | Bin 326 -> 0 bytes include/wx/msw/wx.rc | 1 - src/msw/cursor.cpp | 2 +- 14 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 include/wx/msw/watch1.cur 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 308c07d3325a0d7dc7b480cfd402abd7a25830f6..42a1b9cd76e891045bd82f16adba7688e0e249ee 100644 GIT binary patch literal 326 zcmZQzU}9ioP*7lC;0HnjMg|5k1_lNVAO;FCH~=vt5P|`ef^ZPz|Ns9HoB?71-GB*x z*#G~3fc^jf_QU`G$$$9&ufpd4pXcZ5f876O|8xIuF#cTkcmC&^+WDU=Y#}s|50e9_ T1E~k;1L+5u12zw2E*by;%s^|x literal 326 zcma)0u?@m75Ioa_0*O?#q@-j5Oc5~$5`$y`Bu2<6q+kyU1_+W1u!uPR5+qAdz`fq@ zyT5-M7{Q?^fT_jO0W$y#OOvp+bQV3{WgzJ!naHnO)&P?&kmvTm7})KB%?T*Wp^8ga zUq1Q&fc@bc*E!i_j(h}1y1=n=ENO1aZf2$VR{kOR=PZ!3mt>Vdo%m$JT{@$^;ksa8i~S#5 j@rM$zG3%2xKdU)=t1#-UC)Xl<Xm+CyDH&EX8_v@M rf8_o9Tz?pk`^@a8nV7k=3;J>LQPk^6ty*_Z_nK1F@|t;!pYh5U!Hs({ diff --git a/include/wx/msw/magnif1.cur b/include/wx/msw/magnif1.cur index bb4c8978d6ff06cf471120492e33ef0ec3aa5a9b..15d1a77a49a5053ba171d0c7fdf9937f131814e3 100644 GIT binary patch literal 326 zcmaKmJr06E5QX1@ku@O^8(TM4mfipg?*)mChcNLb8c)C#=xo7?g7AC`8XDqEzMY+) zeX~FS1LuGhERF`)0yqejkO?Cn>>I{pI!R8+>@6&Sg|K1+U@uPMBJl*~?XZk9Z7+~$ zhg0-qGyd!OIU7LlBvAwU!yoH%vK6(cH1`x|5t03xeY|6fl#SZ2jx76}j%~Y^Ahh2U5B#=yVarEx8MAFE4>7bUl^2Og?mRSL=Gs&6db^TgQ3<2@rcN diff --git a/include/wx/msw/pbrush.cur b/include/wx/msw/pbrush.cur index 97212e3faad4bb1f28892269ee9bdfed99e70a85..59c09f171b43fa48562186deed20c92076a14ff3 100644 GIT binary patch literal 12 TcmZQzU}9ioP*7lC;Aa2;0j2;` literal 326 zcmaKmF%m#95Jg{%(HWi5Q7Rq5C7dUY>Ihnm^@EIRz06DYXET|Fg1|69O~(|V1xBeW zW*M|@-s1`1Zf0Nbs%3_3+#s3Ab-zNTT>hw*hh}g&=`~^V@2WRjG~4x!=b@g%1>swF A?*IS* diff --git a/include/wx/msw/pencil.cur b/include/wx/msw/pencil.cur index 231ed1e79f7bc3c1b4291024697607f58f1c91ba..9917b3f79701965e06cd74511194a87935c859d6 100644 GIT binary patch delta 30 icmX@c)W*omz`(@7$e^IW03?Mb@)mM%FfcHP05JeM8Up43 literal 326 zcmbWxAr8Vo5QX8lG@*{707F<=i9liKq44YtxB^G%5jX-8Sy>X&#}92%f$MC(o!QMy zGSW;zF^X7fAEXskiHHh;^NS(%kMXuWJ|+Q$i}h5)HWoBnqGgIv{k!c;GCV%-+?T{b;os zSP@7G>y|3O4mcXGIGN!5#aQw%sibL`?@AgfuJ6QN9S3tZ7qd}UOHELpi1UyBFYIAS cyj18Rikls;)sB37b2n|S@k4y7U-B~F3}KpfZvX%Q literal 326 zcmaiuyAc905JR%f`ZD0jM z&XCqP7_gPwi!6@9G@8EU6PB6e5_)c<19k;=r;4FCrkmqDJCX=NNwWT=y315S|$^?XJ}Ie$^>VfN-^j^;)sJ@vd|u_N68HkD=IZVP*JAV(X;&%%ld&8MqNW< z!_i;|9E7eo3)A_;SiWM)5iyCy?gG~qd!F#V!(V%RxQQ&1bl}lr@fc|Cnba?CECcc| f8>x$^*vja7#8s^r|EH1u{jyS@T2f@6-CZ8va`9(v diff --git a/include/wx/msw/rightarr.cur b/include/wx/msw/rightarr.cur index 9e0e79066182455e5a01b60145f4c8b99ac4595c..c54c3ac4b09fa88728c865d94ae7665a35103f42 100644 GIT binary patch literal 326 zcma*hu?@mN429u$0nw&IbV*4`OO=em2yBpymQgYS14Q@uO%6p!6!Gah+ozLdsZvtg zN*5h!mc-a5| literal 326 zcmZ|JJqiLb5QgC|27ihLE5&k4OG``dvPZD7_Yxk(Qt%>*7YNt{6vubmz!s7TPrghN zLZp#`+E!XIJjvNXpO5#Gxku*C}8 nuM~f%*OQ}rk;wEi%X@TY@7TMLHzee;_aV(4am54v*nfQi*MWc% diff --git a/include/wx/msw/roller.cur b/include/wx/msw/roller.cur index bb7f16613384321a0a749dd94a669c8412bff613..118c37fa439da2836f547914c866d3ad0c003d64 100644 GIT binary patch literal 326 zcma)$I}*Y$3`C#F4C%Z3C?dI`TF$@uUN14)|3YajPI_8K rFQraeTWM*eIcyiAFHcrrC03IaWo0{Xest~R1*yP9Dew9N9?13vQju`7 literal 326 zcmc)Eu?@m75QX7)i4X+^RH-6#B_$=LN1#dXP2v$UN2c%yjKBy?!10G5WdzRpY(MK{ zoz%$WE~?knq>kGKjs#vybS+aqEN+zK*oIOF(~_HU_;mu%^cC^pa4h9U7~#-04& feWKl^v97-qVuIs@9?NtG?26P>rptuN41cW;gqE8j diff --git a/include/wx/msw/watch1.cur b/include/wx/msw/watch1.cur deleted file mode 100644 index 323f01c3e5e7698be6414ef664354d7ea0f22e9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmaivJraU25QSf)pp2D`1(cRnc8K@U&N5=Sffr&X+D1Gxgi3q~VR9qe@^c#Y7>X|n8t*m76w1H{s zr7CaR)|{f(J!4c8mx}1ip7d3bc70DoI%77Z4}m_{fk|pv94%{lCdt{O^Kzc--2m~F i8VD>PE5OeIk4fEEM(`)bcU<#fzj9iv$=XvdzJCB`+hyqh 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 -- 2.45.2