From 35cb486ae02b9edb2a142f80fe362e29b1496298 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 20 May 2005 09:18:26 +0000 Subject: [PATCH] Image updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/docs/latex/fl/contents.gif | Bin 996 -> 996 bytes contrib/docs/latex/gizmos/contents.gif | Bin 996 -> 996 bytes contrib/docs/latex/mmedia/contents.gif | Bin 231 -> 996 bytes contrib/docs/latex/ogl/contents.gif | Bin 996 -> 996 bytes contrib/docs/latex/svg/contents.gif | Bin 996 -> 996 bytes contrib/samples/ogl/ogledit/ogledit.rc | 6 -- contrib/samples/ogl/studio/bitmaps/alignb.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/alignl.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/alignr.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/alignt.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/copy.bmp | Bin 238 -> 0 bytes .../samples/ogl/studio/bitmaps/copysize.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/cut.bmp | Bin 238 -> 0 bytes .../samples/ogl/studio/bitmaps/cutpoint.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/help.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/helpcs.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/horiz.bmp | Bin 238 -> 0 bytes .../samples/ogl/studio/bitmaps/linearrow.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/new.bmp | Bin 238 -> 0 bytes .../samples/ogl/studio/bitmaps/newpoint.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/open.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/paste.bmp | Bin 238 -> 0 bytes .../samples/ogl/studio/bitmaps/preview.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/print.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/redo.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/save.bmp | Bin 238 -> 0 bytes .../samples/ogl/studio/bitmaps/straight.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/toback.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/toback.xpm | 25 ------ .../samples/ogl/studio/bitmaps/tofront.bmp | Bin 238 -> 0 bytes .../samples/ogl/studio/bitmaps/tofront.xpm | 25 ------ contrib/samples/ogl/studio/bitmaps/undo.bmp | Bin 238 -> 0 bytes contrib/samples/ogl/studio/bitmaps/vert.bmp | Bin 238 -> 0 bytes .../samples/ogl/studio/manual/contents.gif | Bin 231 -> 996 bytes contrib/samples/ogl/studio/studio.cpp | 85 ++++++------------ contrib/samples/ogl/studio/studio.rc | 25 +----- samples/sockets/connect.ico | Bin 766 -> 766 bytes 37 files changed, 27 insertions(+), 139 deletions(-) delete mode 100644 contrib/samples/ogl/studio/bitmaps/alignb.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/alignl.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/alignr.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/alignt.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/copy.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/copysize.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/cut.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/cutpoint.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/help.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/helpcs.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/horiz.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/linearrow.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/new.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/newpoint.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/open.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/paste.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/preview.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/print.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/redo.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/save.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/straight.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/toback.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/toback.xpm delete mode 100644 contrib/samples/ogl/studio/bitmaps/tofront.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/tofront.xpm delete mode 100644 contrib/samples/ogl/studio/bitmaps/undo.bmp delete mode 100644 contrib/samples/ogl/studio/bitmaps/vert.bmp diff --git a/contrib/docs/latex/fl/contents.gif b/contrib/docs/latex/fl/contents.gif index 723174f81d04d16e94016186ac0322dcddb603c7..da92528ddd51bc53faff487ebfe232ebe3ea2136 100644 GIT binary patch literal 996 zcmZ?wbhEHbbYM_m_|5;{U+J45ENEC|UpiulSRNk%57mK?meFP@Z7mILIK*A>*-O!NFz@VXc@G z8x|gJ7f=>saS&`c(k;QtlyG2TAW{5J|>@-%;r8xr*qTNV^g(#cb$pYxXic9 z*l|_M&A_yC9oCgqe>x2{{O7yK=52Yo@zI4P4)gUQehFz_X$@JOwf9#+=GokxA zV8N1xh6Z3tW&ovR5Cxe34SwPCqkp^L+21?)C@%eigo zjb6XYK{ltit-ZayK=RQZsqlw)b_u-S7xTMFKYoAy)o)vOlz%vRFz5Xto6e7mgSU6F l8>#t(=cJr!`K{OHv%&EGv6=dhWPNvSd3kw-DjN%fH2`phKPvzL diff --git a/contrib/docs/latex/gizmos/contents.gif b/contrib/docs/latex/gizmos/contents.gif index 723174f81d04d16e94016186ac0322dcddb603c7..da92528ddd51bc53faff487ebfe232ebe3ea2136 100644 GIT binary patch literal 996 zcmZ?wbhEHbbYM_m_|5;{U+J45ENEC|UpiulSRNk%57mK?meFP@Z7mILIK*A>*-O!NFz@VXc@G z8x|gJ7f=>saS&`c(k;QtlyG2TAW{5J|>@-%;r8xr*qTNV^g(#cb$pYxXic9 z*l|_M&A_yC9oCgqe>x2{{O7yK=52Yo@zI4P4)gUQehFz_X$@JOwf9#+=GokxA zV8N1xh6Z3tW&ovR5Cxe34SwPCqkp^L+21?)C@%eigo zjb6XYK{ltit-ZayK=RQZsqlw)b_u-S7xTMFKYoAy)o)vOlz%vRFz5Xto6e7mgSU6F l8>#t(=cJr!`K{OHv%&EGv6=dhWPNvSd3kw-DjN%fH2`phKPvzL diff --git a/contrib/docs/latex/mmedia/contents.gif b/contrib/docs/latex/mmedia/contents.gif index 3dddfa3dd5f0c652e8b27cd6c29e1fdd49ced5a8..da92528ddd51bc53faff487ebfe232ebe3ea2136 100644 GIT binary patch literal 996 zcmZ?wbhEHbbYM_m_|5;{U+J45ENEC|UpiulSRNk%57mK?meFP@Z7mILIK*A>*-O!NFz@VXc@G z8x|gJ7f=>saS&`c(k;QtlyG2TAW{5J|>@-%;r8xr*qTNV^g(#cb$pYxXic9 z*l|_M&A_yC9oCgqe>x2{{O7yK=52Yo@zI4P4)gUQehFz_X$@JOwf9#+=GoG0Pz3-zrVld=jU&4Z(9HWEC2ui06_p40008OjE||y?GK}z zO&EZ)-n{z{a)K3v=81;mmA0S4Fj_r^UyThZDG{h6k9m zHI_(7spd!5_$SH6m{;{U+J45ENEC|UpiulSRNk%57mK?meFP@Z7mILIK*A>*-O!NFz@VXc@G z8x|gJ7f=>saS&`c(k;QtlyG2TAW{5J|>@-%;r8xr*qTNV^g(#cb$pYxXic9 z*l|_M&A_yC9oCgqe>x2{{O7yK=52Yo@zI4P4)gUQehFz_X$@JOwf9#+=GokxA zV8N1xh6Z3tW&ovR5Cxe34SwPCqkp^L+21?)C@%eigo zjb6XYK{ltit-ZayK=RQZsqlw)b_u-S7xTMFKYoAy)o)vOlz%vRFz5Xto6e7mgSU6F l8>#t(=cJr!`K{OHv%&EGv6=dhWPNvSd3kw-DjN%fH2`phKPvzL diff --git a/contrib/docs/latex/svg/contents.gif b/contrib/docs/latex/svg/contents.gif index 723174f81d04d16e94016186ac0322dcddb603c7..da92528ddd51bc53faff487ebfe232ebe3ea2136 100644 GIT binary patch literal 996 zcmZ?wbhEHbbYM_m_|5;{U+J45ENEC|UpiulSRNk%57mK?meFP@Z7mILIK*A>*-O!NFz@VXc@G z8x|gJ7f=>saS&`c(k;QtlyG2TAW{5J|>@-%;r8xr*qTNV^g(#cb$pYxXic9 z*l|_M&A_yC9oCgqe>x2{{O7yK=52Yo@zI4P4)gUQehFz_X$@JOwf9#+=GokxA zV8N1xh6Z3tW&ovR5Cxe34SwPCqkp^L+21?)C@%eigo zjb6XYK{ltit-ZayK=RQZsqlw)b_u-S7xTMFKYoAy)o)vOlz%vRFz5Xto6e7mgSU6F l8>#t(=cJr!`K{OHv%&EGv6=dhWPNvSd3kw-DjN%fH2`phKPvzL diff --git a/contrib/samples/ogl/ogledit/ogledit.rc b/contrib/samples/ogl/ogledit/ogledit.rc index 046f0c6f45..fe1ac37f07 100644 --- a/contrib/samples/ogl/ogledit/ogledit.rc +++ b/contrib/samples/ogl/ogledit/ogledit.rc @@ -1,10 +1,4 @@ ogl ICON ogl.ico -TOOL1 BITMAP "bitmaps/tool1.bmp" -TOOL2 BITMAP "bitmaps/tool2.bmp" -TOOL3 BITMAP "bitmaps/tool3.bmp" -TOOL4 BITMAP "bitmaps/tool4.bmp" -ARROWTOOL BITMAP "bitmaps/arrow.bmp" - #include "wx/msw/wx.rc" diff --git a/contrib/samples/ogl/studio/bitmaps/alignb.bmp b/contrib/samples/ogl/studio/bitmaps/alignb.bmp deleted file mode 100644 index 6cc2e1dee47c12433ba418577a2e5ad73fab4848..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcma(~u?>JQ3^NiN1DwGf?EKP+GUlZ2U3w8O1iKLn5)y7~M{(M2`-Q+kTgio-$pIr3 yIJ<@@69WdYU=~JYi`E)lf%k&DI+8~tN`4^$nJY-OD*JU>wjJEKHuH!bxvFW diff --git a/contrib/samples/ogl/studio/bitmaps/alignl.bmp b/contrib/samples/ogl/studio/bitmaps/alignl.bmp deleted file mode 100644 index 30471101b16de3328c3d7a9ddbb74c95669b30c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmaKju@QhU3fPl58tp)=Q2Jo8bgU*r`XQ zqpFK#Mn{w=#ps68D(8$_P->|Z>mbio$leeL#26AdfBgB^?p|K+nFqW7@RnP41Lmtt AkpKVy diff --git a/contrib/samples/ogl/studio/bitmaps/alignt.bmp b/contrib/samples/ogl/studio/bitmaps/alignt.bmp deleted file mode 100644 index 4505cbab566385942c0912c245668a2567a6e4a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmaKkF%Ez*3|OdIzEIAs*ie($j$$j@{;1V~tY85%7&OAt xRk@Kpqg9j`#n=R9Rn8f;QR=7^Z-Dj*I)92ty-z9KwtE_g+7Cp#O78pXpD*v#PFw&0 diff --git a/contrib/samples/ogl/studio/bitmaps/copy.bmp b/contrib/samples/ogl/studio/bitmaps/copy.bmp deleted file mode 100644 index 4551a06bfa79e0a42c1ffb7cdbb90fd4f699dce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvVK?*`K3`9pLxU9$U91{2|@hV+>tjiv)Cz3AyzP{vxy7<$~OeTT!c7JQf6T89- z%?kmn<${;(P#uFN<0A#FuUo(qgT{&F@ekspii W=d@ZzPG(Cb=QBs}_=7thzxV(viB<;y diff --git a/contrib/samples/ogl/studio/bitmaps/copysize.bmp b/contrib/samples/ogl/studio/bitmaps/copysize.bmp deleted file mode 100644 index 36060ad72b54ea2be52e4a1ed7b4dda2ca3cf18f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmY*SIS#`x3}b-;8ZxBM=sU9KFPf^3eo}TVeo?>RP?8g%v`FfLyzM^}KD0OaB3JT( zCl&anmc%SrXaEDPl~I|Z_fC(&$iNtpk$lmjm`TEJhyo%k)jjO4=f?j&&jF^kxcgy{ PbY7_X>Z|3R^1F!>`pH0Q diff --git a/contrib/samples/ogl/studio/bitmaps/cut.bmp b/contrib/samples/ogl/studio/bitmaps/cut.bmp deleted file mode 100644 index 15554338a01bc4d8f0a501c32237e84200e64583..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvU!3}^Q5Cqr6gr}Ba8OD(CvKJo2^+{<|WDB@(K8*2TclNjo+kV075Ef~cCTYMZ z2hQ$)mH}PlY>+FWlp?l4?H9GSB752pV-TKD6nB)nBfGIKB%-0 z4e`tjREbcnVJN9uYq$q}gnD-dd2S))joA(4hnda^3ME@9IU}4&(EFo)=5zeN_9_1d HoZL78p=?Bh diff --git a/contrib/samples/ogl/studio/bitmaps/help.bmp b/contrib/samples/ogl/studio/bitmaps/help.bmp deleted file mode 100644 index 2d9e6922cac0fb0aefa32fd5bae9d460e13484b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZuq!3}^g2t1P}{g~(&&f(u(`VyZVjR87~E7Sw@p^qTFi~p=nI%+}YJ={H-mN0|?29BK#fUL#erbtT(lh^R?4vYy(d-6AGn1|j$rr}v KbDqI%Xjd+{i$y;G diff --git a/contrib/samples/ogl/studio/bitmaps/helpcs.bmp b/contrib/samples/ogl/studio/bitmaps/helpcs.bmp deleted file mode 100644 index 88373816814a283aa9ecca7899faf81ce7a15b4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvV!3{z&3`32Clp~D69NgKZC&ICtwG;gn%5(a;k=Ax%E6VeAXxAHgfIGN>i>|Qr zDgH-8;%kg8Fsb(=J`dZ5!;MsyQTV&Nwu@o7(Ri`byve-X0yz0?`b73&zHji5? LZQ&!hb;r)SF8kLTs=5{{JE?DUYEK&^#0pxo{w%L C5KP+u diff --git a/contrib/samples/ogl/studio/bitmaps/linearrow.bmp b/contrib/samples/ogl/studio/bitmaps/linearrow.bmp deleted file mode 100644 index 1fd21fb08ac4a0d07a8b724700eb40c11a276698..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZWjF%p0<2#a^_%H$V(hr5qq5yw8QFY*gDG6I3Fl3%1*4rLQI&+z};Dt zvxK4mOq3!avqY_xnuFF8tz|{`6V diff --git a/contrib/samples/ogl/studio/bitmaps/new.bmp b/contrib/samples/ogl/studio/bitmaps/new.bmp deleted file mode 100644 index d66feb2384ad4c626a078c995c1a3e49af78ec3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmbu2yA6Oa5JQcGL>b0l4tjP;1(ew=nJ8j|<6WY3bU0`GK9aK^RUId`!4(ELX-1{H u>6c`QQqJ8_T9s0iQsQ8(Wab^@`3kuPA_p->w)Xt4Pkz>06 diff --git a/contrib/samples/ogl/studio/bitmaps/newpoint.bmp b/contrib/samples/ogl/studio/bitmaps/newpoint.bmp deleted file mode 100644 index cb4f267afca22039f403ed5f92a6c6a0c2978131..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcma)!u@QhU33XfhEigttvWi5y9eoOs=CC3b9qGo0X{5tYu+ z6rVX0MdGNGG?Z4YHQWb1j(YbFQXV14f9QQ2&YA$3=;=;U&0ua+_3>YyQsonW~6N3OvKTr2(k@|B{{YeKb~(CUb3rr5zpcQ zCn>O}mP9XDa6kd~GO1FGG0<95V`X5i$V8neN$dxz4&8XX3!AZr-;ApY^eS-9oTLj~ Y^Hcc9z2|$wrXTtLH=Rc2n(WoWFRhqJ00000 diff --git a/contrib/samples/ogl/studio/bitmaps/paste.bmp b/contrib/samples/ogl/studio/bitmaps/paste.bmp deleted file mode 100644 index 564f514e0df7225f0a7adbe8457b41af537813bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvVF%Ci@5Jbns$83OZ*I;# co}I%%@f6>ra3+S=gC69}eM%GII+SAI4J;x>B>(^b diff --git a/contrib/samples/ogl/studio/bitmaps/preview.bmp b/contrib/samples/ogl/studio/bitmaps/preview.bmp deleted file mode 100644 index da1f4dbc4be6c2dd8fb9d7cb71cc48a4a7c139ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvVu?@p83pv2yNo4mlT?N_pr2ISnd1NHDM5O^cFcMc59&^> z)PfrwsOeYM05)2ipmU4fJIss+o(=cdQCu+!%TlZiKDH!a!aP2;C|UGpLD9M;zmsLJ XIp;lzIUm!ckI6HO{IjaYcZ_-fA4^nl diff --git a/contrib/samples/ogl/studio/bitmaps/print.bmp b/contrib/samples/ogl/studio/bitmaps/print.bmp deleted file mode 100644 index 00319b55bb23c3c69cc051144d80e5275747c53e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZur!3_d23^Ni^o@EUFY`~vgA|YX<`*bfpod|VizM>j+f}Fx~Q7! zgtHKM7yg3|DAD^Sp<0YF#C}+nSj(MC$5#Ss27*aN<{l9dJQ3^NitoWUKaQYXHtaK{cvyw!_%p*Ri9bz(b-vmXx}r)(2faSYV3`7rsq)3!X>4ws(){6V0MX5FKAjcylGXqN-n#XsS=YhW0WogZT{L^_i_GT%*k@+ph E1NJ~MtpET3 diff --git a/contrib/samples/ogl/studio/bitmaps/straight.bmp b/contrib/samples/ogl/studio/bitmaps/straight.bmp deleted file mode 100644 index 529366590b71d7afa1ef14750426a874c8df6c3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmbu2!3}^Q5Cqr6#HW^F9sccwm-?hMDzXKf<$@OAal3P{0k-{C)B#qspcxGsap`Iv q=FE!960MvAIHO7_&_QjjT0J3_kFfKrMCAR;DYEp3e$)3m`*#mOwn9e$ diff --git a/contrib/samples/ogl/studio/bitmaps/toback.bmp b/contrib/samples/ogl/studio/bitmaps/toback.bmp deleted file mode 100644 index d2e5efffcea17b5340e8c9278186ca5cf16e666e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZ`yu?>JQ3^NiE0|T7F9qjzl2^cf>9QF?FMZ8d)1PO#h65C0vwDWSpW2H>QNDM@S zmJIC1PUJQ3!n}6e%=pgD_<}*2+Yz5YBOr`1t>vyt3|(LMK@8j3+#3B&Dlo ygm>;xkrJQ30?Ld;pCXxv6~fs8i2~vH|E+&J(|oGdii}_YJ!sUz z((YWzGDEE-(MqWb%&45RLI?!KTcy|pcxFM{N3r657vo{E>4N2o^{e;ZbNANgU-K?u CAW)M4 diff --git a/contrib/samples/ogl/studio/manual/contents.gif b/contrib/samples/ogl/studio/manual/contents.gif index 3dddfa3dd5f0c652e8b27cd6c29e1fdd49ced5a8..da92528ddd51bc53faff487ebfe232ebe3ea2136 100644 GIT binary patch literal 996 zcmZ?wbhEHbbYM_m_|5;{U+J45ENEC|UpiulSRNk%57mK?meFP@Z7mILIK*A>*-O!NFz@VXc@G z8x|gJ7f=>saS&`c(k;QtlyG2TAW{5J|>@-%;r8xr*qTNV^g(#cb$pYxXic9 z*l|_M&A_yC9oCgqe>x2{{O7yK=52Yo@zI4P4)gUQehFz_X$@JOwf9#+=GoG0Pz3-zrVld=jU&4Z(9HWEC2ui06_p40008OjE||y?GK}z zO&EZ)-n{z{a)K3v=81;mmA0S4Fj_r^UyThZDG{h6k9m zHI_(7spd!5_$SH6m{AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New file")); - toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Open file")); - toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Save file")); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Print")); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy")); - toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut")); - toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Paste")); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Undo")); - toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Redo")); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Help")); - - toolBar->Realize(); - - toolBar->EnableTool(wxID_COPY, false); - toolBar->EnableTool(wxID_PASTE, false); - toolBar->EnableTool(wxID_PRINT, false); - toolBar->EnableTool(wxID_UNDO, false); - toolBar->EnableTool(wxID_REDO, false); - - int i; - for (i = 0; i < 10; i++) - delete bitmaps[i]; + toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New file")); + toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Open file")); + toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Save file")); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Print")); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy")); + toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut")); + toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Paste")); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Undo")); + toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Redo")); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Help")); + + toolBar->Realize(); + + toolBar->EnableTool(wxID_COPY, false); + toolBar->EnableTool(wxID_PASTE, false); + toolBar->EnableTool(wxID_PRINT, false); + toolBar->EnableTool(wxID_UNDO, false); + toolBar->EnableTool(wxID_REDO, false); + + int i; + for (i = 0; i < 10; i++) + delete bitmaps[i]; } // Create and initialise the diagram toolbar @@ -396,19 +379,6 @@ void csApp::CreateDiagramToolBar(wxFrame* parent) wxBitmap* bitmaps[11]; -#ifdef __WXMSW__ - bitmaps[0] = new wxBitmap(_T("alignl"), wxBITMAP_TYPE_RESOURCE); - bitmaps[1] = new wxBitmap(_T("alignr"), wxBITMAP_TYPE_RESOURCE); - bitmaps[2] = new wxBitmap(_T("alignt"), wxBITMAP_TYPE_RESOURCE); - bitmaps[3] = new wxBitmap(_T("alignb"), wxBITMAP_TYPE_RESOURCE); - bitmaps[4] = new wxBitmap(_T("horiz"), wxBITMAP_TYPE_RESOURCE); - bitmaps[5] = new wxBitmap(_T("vert"), wxBITMAP_TYPE_RESOURCE); - bitmaps[6] = new wxBitmap(_T("copysize"), wxBITMAP_TYPE_RESOURCE); - bitmaps[7] = new wxBitmap(_T("linearrow"), wxBITMAP_TYPE_RESOURCE); - bitmaps[8] = new wxBitmap(_T("newpoint"), wxBITMAP_TYPE_RESOURCE); - bitmaps[9] = new wxBitmap(_T("cutpoint"), wxBITMAP_TYPE_RESOURCE); - bitmaps[10] = new wxBitmap(_T("straighten"), wxBITMAP_TYPE_RESOURCE); -#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) bitmaps[0] = new wxBitmap( alignl_xpm ); bitmaps[1] = new wxBitmap( alignr_xpm ); bitmaps[2] = new wxBitmap( alignt_xpm ); @@ -420,9 +390,6 @@ void csApp::CreateDiagramToolBar(wxFrame* parent) bitmaps[8] = new wxBitmap( newpoint_xpm ); bitmaps[9] = new wxBitmap( cutpoint_xpm ); bitmaps[10] = new wxBitmap( straight_xpm ); -#else -#error "Not implemented for this platform." -#endif m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align left")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align right")); diff --git a/contrib/samples/ogl/studio/studio.rc b/contrib/samples/ogl/studio/studio.rc index 70a7a9c9e4..e63bd2bfab 100644 --- a/contrib/samples/ogl/studio/studio.rc +++ b/contrib/samples/ogl/studio/studio.rc @@ -7,35 +7,12 @@ aaaa ICON "studio.ico" wxSTD_MDIPARENTFRAME ICON "studio.ico" wxSTD_MDICHILDFRAME ICON "studio.ico" -studio ICON "studio.ico" +studio ICON "studio.ico" folder1 ICON "bitmaps/folder1.ico" file1 ICON "bitmaps/file1.ico" -new BITMAP "bitmaps/new.bmp" -open BITMAP "bitmaps/open.bmp" -save BITMAP "bitmaps/save.bmp" -copy BITMAP "bitmaps/copy.bmp" -cut BITMAP "bitmaps/cut.bmp" -paste BITMAP "bitmaps/paste.bmp" -print BITMAP "bitmaps/print.bmp" -help BITMAP "bitmaps/help.bmp" -undo BITMAP "bitmaps/undo.bmp" -redo BITMAP "bitmaps/redo.bmp" - arrowtool BITMAP "bitmaps/arrow.bmp" texttool BITMAP "bitmaps/texttool.bmp" -alignl BITMAP "bitmaps/alignl.bmp" -alignb BITMAP "bitmaps/alignb.bmp" -alignr BITMAP "bitmaps/alignr.bmp" -alignt BITMAP "bitmaps/alignt.bmp" -copysize BITMAP "bitmaps/copysize.bmp" -vert BITMAP "bitmaps/vert.bmp" -horiz BITMAP "bitmaps/horiz.bmp" -linearrow BITMAP "bitmaps/linearrow.bmp" -newpoint BITMAP "bitmaps/newpoint.bmp" -cutpoint BITMAP "bitmaps/cutpoint.bmp" -straighten BITMAP "bitmaps/straight.bmp" - #include "wx/msw/wx.rc" diff --git a/samples/sockets/connect.ico b/samples/sockets/connect.ico index 74f006f82a3440425c3074f976c52a3405cf9427..7844dfd2bcc45870b0b7246f96ddb9e13c4e0919 100644 GIT binary patch literal 766 zcmdUtEfT^o5QSf%rh@>5Z6&t=v7RH5BVePr0zRfkK_V*hB?^AC3-m5&o4bU<~=xbi8Vk+L;bew>eke;Rmy%wGN=FG7ep<7LWhPuU+uQU-34 z&Kt*N@8Bl8EFnKU7PYH&P>))B6r<*hzfvt!pZsI)RCoB?77rS7?CIyGaW>tl7w)-i Fqh3-Hn{EIA literal 766 zcmc&wF%E+;3^Y}xveBtCW1rC{v32#>FCZcD6&`@pZ*(fGND=AT7eK8#b*Y0LU(Rvx ziDX!1c@(q9PUM9B3@_mqcqV&95e4_%6eJi`ZiqV zYUUL2&Fruiuzthi2hWC8s-GhHrQg(!iVivHsjll$hau)g==(kr&&_?ot<{I&>Gj}S z^jq&6j;X)(Bj)?|>j_)x_8aEBTmMZT_RH7#iCJ&@5O4aV_r0Jh!W%C@;9U