From 98b67b810e2102b52701c52e03b2a5cc8f46afae Mon Sep 17 00:00:00 2001 From: David Webster Date: Mon, 21 Jan 2002 19:51:49 +0000 Subject: [PATCH] More resource files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/cdrom.ico | Bin 0 -> 4026 bytes include/wx/os2/colours.bmp | Bin 0 -> 122 bytes include/wx/os2/computer.ico | Bin 0 -> 3498 bytes include/wx/os2/csquery.bmp | Bin 0 -> 206 bytes include/wx/os2/drive.ico | Bin 0 -> 4026 bytes include/wx/os2/file.ico | Bin 0 -> 4026 bytes include/wx/os2/floppy.ico | Bin 0 -> 4026 bytes include/wx/os2/folder1.ico | Bin 0 -> 4394 bytes include/wx/os2/folder2.ico | Bin 0 -> 4026 bytes include/wx/os2/removble.ico | Bin 0 -> 4026 bytes include/wx/os2/watch.ptr | Bin 0 -> 288 bytes include/wx/os2/wx.dlg | 34 ++++++ include/wx/os2/wx.rc | 203 +++++++++++------------------------- include/wx/os2/wxos2.h | 43 -------- include/wx/os2/wxrsc.h | 48 +++++++++ 15 files changed, 142 insertions(+), 186 deletions(-) create mode 100644 include/wx/os2/cdrom.ico create mode 100644 include/wx/os2/colours.bmp create mode 100644 include/wx/os2/computer.ico create mode 100644 include/wx/os2/csquery.bmp create mode 100644 include/wx/os2/drive.ico create mode 100644 include/wx/os2/file.ico create mode 100644 include/wx/os2/floppy.ico create mode 100644 include/wx/os2/folder1.ico create mode 100644 include/wx/os2/folder2.ico create mode 100644 include/wx/os2/removble.ico create mode 100644 include/wx/os2/watch.ptr create mode 100644 include/wx/os2/wx.dlg delete mode 100644 include/wx/os2/wxos2.h create mode 100644 include/wx/os2/wxrsc.h diff --git a/include/wx/os2/cdrom.ico b/include/wx/os2/cdrom.ico new file mode 100644 index 0000000000000000000000000000000000000000..e9e2364af1f77fa89b5d4688bdab1903923b11fa GIT binary patch literal 4026 zcmdT{&1)M+6n~0h6zr1m!A+n&I7gGxI)6YxZgL9r&_hdlD743rOMDA76z!$3uI)}K zJ;eCn+*&M40;qXp+#STsR8se z1BM$no$oMxobRsw&UvRFMQ=C&@R&Si9*#U}K@ez^Ys`!oa>~(V`7tLAHZEt0u4qpE zS(>=4A98w{GlEYQ_iKuK9@1uYhG7`OjPW}L69cRBw?&&Q#$XJ-yI{~0@JSE4s~;Y5 zdh&MKENOC-rSVHyUcGo+mRq+Q{NZ}6Z^PO<>6YXG}H18o0+lm~e7 z8NlkQq2+G?HV*)PNBXN}uw=srgkp;rU>YYu zsr!is^0kRUv3eRG%~)vdr6?VJ2#`wvvI<}vk)jTeaZ~|FGo`$A#r>#n`t zBA?`&V^FM~25;Eh`o{vGjwiZ;Z!wXFC%BiKoG^s#TmSwX?6zqC+ci`O_Y_V)&)jgwKEO6Ndxj9KibJ{+W4nwu1JhlBOK{&VV}yG^4sZ z3n?#CPge|4-^vL?L^cC^Pri@rJ;jDowIh~V`SY^tO8eNhUO0hJ3di&1BJBn?M6dAwDMA~q1dFMX|F6dDa4lXu+b_Rjh`J0Rm&YZ1)Np%@PYszr>4!}n{Q zF&;XSA2&|Ac%xrm56GVhgXzxAeP3j^<{XJ?HC)x&M}H>2D9XUZiPhK=%s-p!06q2(F$#K(3CP?VB9(L4|?|wvHI-4ilNnxVYfLA+wDiN-Mj{C zKmGt~cQ@ck%MkT{TH1i8`Vnj*g?bvAhcT#qrX2fr-P^K zkYQedG;z#4;fV`0rz3RG}$^=B5#Sd(lM zSRff!qKncr#YLBJ%MOUwBOA-b(sF2l0xK)o&McM+1uIiha*3WP7oup_x}*9=IIPOm zT1Uo}dA869=tjmyMH7)&of|=tB<#@0Y(@3wx-uzDRd#ihO;0IXCu0}G*5z8Q7F3I- za@!b?1VJ@?Y^t}p4)91fu!288dzvBUPVF#?!ZORWqOS^SA`J5@B%?KR>sMILub>&q z@WaI5puJo+I4P|u8t3y1j8o1O!EKAPA1G`t4h*j2jif>^PzV=*fp`=K&X867kD0qa zR4T^W5knoOp#s;KJp50|^c8X}1s!hZ(X zGFtkxi)*aN;Y&2TSYSm?D!E^ZsGq?j(Yjv|H&X-2s?I%%{zDHP| w1mSNve8nh0F3Ki3VIt-`0Q92-t69tBXbHSwRs{-X6`H745|$u>h-6J4SbE#*zN6{^_i zxF_O&KWF_b@M9x{E(nxX(0GDe-V@A7)Sah!IzU6DCnb`+cF$&A;;$`Oe<|VDd2aAa z|IGM0B=QuI3*_;f4S)_XFmRwR;2dKPC=2ZY?jOLD+H_qBL*L4F9m(8AEdHh>=P;J8 z1dK?*&R2OH9qfM-qE)^w6C%GV_-5>yc;(x1BW!T!H^OKVC6%P$bGM zFu%=l{wP=8c$(w$qa5?s8KOD7*c~h|1AQ;Uyq9@b-ODtaqk0$i&k4JtJsppF4(g)( zlp=R^6bdi8tpRiET=$XN1J1Pvz8^TVn_<@XJI>-_x99t(y@k8o-m@2{J)$n~^CM9w zYctBPkd*c}X2HN??m|zNDHs1gY(fWgXW^Sx3lGRkTkeF_TX>fHPzG?OwHBX@<#Ji= zMdM3#U@iqCk)9WrdU8@(=Kp)G_cv`nu%z2AX@->bjqc#{3@mZu_AB7KkB#o5w+7Jiuk{;17DoEpy$iR#)9-bH_cT wqTA*jjeu6&0dU3@w=dYLc>UIM?r+p;{ZAFA?^NiFA3O=^JQ3NO63A`|X_9tB40VV1)%H%~a`z z9mCn^oroflDkX$Ut6D4Si`G-Ec?UeVDAq%0PG+O}Vx0fIaf_c5#-RPy@8jPGr>8KF literal 0 HcmV?d00001 diff --git a/include/wx/os2/drive.ico b/include/wx/os2/drive.ico new file mode 100644 index 0000000000000000000000000000000000000000..06ed593368db5fdca7820071a09ded3411df6c1e GIT binary patch literal 4026 zcmds3F>D+~6#dH?@5zLmS8_!V=hC7;fmA4nbK)w(64b6-QP6lKBh86ezJV0GSV-5p zN<@RxQ-b27vIUmYQC}n!kPEX4h1ck`!~1_`Z+9G7Q)-yCiN1=;ijutAbmLNs)x$xs^dyLue+;7cjt46r z{XIi#IZ`M0&9oVvxeH3YM2oKy9R5YxoG&mQGUFfeH1sPOP%j!)?N@HJrs)FO%xnq9@IADiP?%)w4PD}-kEQCm0f4(n z-w2cu8Jmz>xv+gVK@SI+04^a2U|Y0ut-3Xs=&*)UMO6ZkV1dRK0!zZff*3%_}*?$|FS#0 za@}T^{%Ysf4t8>V?KJ=V;e*Zfj=j5KcOS1G+tZKl+{-__{CmD}{WRbBGv8d_wRbnI zeS8}`dJQ|fgSv&C-LTl%7CXBG_pKpzwvjMi{{H9l*Pp@NAPSCyDC~V1y}9=&T7Umh zw0yj}vTnC%d2LAV{_w}*r}>a>+iwro>~D)5n@}sK!$vl57nWJrDoO+N#ffFx7nQXy4CH@fVC^YyQRw7Q4tu0wTX2p;f%y!A!1WN~ zz_lT2qeiA;3u0g6fn>_(<$8dJFDG1cG4lW4`Qvzs_&9#fAf6Aj&&?0bGT(upe@bpW zMy!pzPS8iG_oT+_b4o=63#$pGWO_m^9mQ%<>pr2H-pYu~l$LB&h^6l?lvmhNW6`fr zS+BFn{iLF_qP593s8VgAUtzNEs6ug_rg;(eswNJ$O zzs0i3%IdT_u_vm<>Mlj}8WaS(P;6MnIN?tq+AOt&A#@v`9{;>tzO&QvLXh2nqUQzW zEJf2xN=VlAD#avoV{K+PASd;n$w|!@!&225a+%P6p(F`vKKzMT?LIyvOL9yh`F!^Z zRgg8xkrNb?Pf;Ayg%#0{J)Hfl0jvekjtkQdt;X}fWugEY_X!Vl+&n>^z$(-`swde? zr1w-` U5pXOQnbZZ!z`t?}d`^~s0EQ^$egFUf literal 0 HcmV?d00001 diff --git a/include/wx/os2/file.ico b/include/wx/os2/file.ico new file mode 100644 index 0000000000000000000000000000000000000000..a0769fac514174c22274092ffd2c09763e1b8d41 GIT binary patch literal 4026 zcmeHJy^hmB5FX=$L;+zVrJ}$oBMQVD_;OdBL_vKO^;PaT(b#3ggYX=tJ>?-%o}$xX z(b(Pc&5z?Xq`CM`Dacr#$2&9Lo&EOrY%wRI4*<)>`CGilc&?riy~1})GYarPoO5Rq z{ew%8^9zoS@oX%5MyFo1=MS~EnbdZ|KNo^RRDn{#vRbVi><(?Qg63A+cHc=FZM&T1 z=J~EHwO#4Oi`E|_uYKG7WbGOe&}O7rOlj`1qtU-DT63P# zl)jHOdQP9c=*~ZR+4{M*efxwQB}=WBvwZ)0SC*asX6v8s)hO zG?JyJuVeWU`B*NOKA$yn?eSf^rpS6_3Ez%Kt?sU@?yf9g{b58MH_TILR|=_8eUBg4NHl>ra}5!gA(AO;%z zjiU~%{(m~Pe&?n!rJ0AobZB~Hnh!(v^Au;Dv-UPj-KjD$_FrPlvBPvy9c}K&f%}Jp z2FJdh%=vb*$W-}jzQAh-dKZ`5m4K&aD|s8{+w5x4i?iB%+qGR0dN#Wz__j=P<0;?X z9r|Zye=!UzJ^K04-gmsTq>D!3;lK47D8q+4;5MJyb=qko#s?rQDkk)$Dc)w;1w6@OPWn6vhU8R+bcV^y`XjKy}#}6yR$_NEbF?G9L z4ZB7z7Lc6P+MRA?!Kj(C5u-coagD)g)%-b-{pHHu z6b%QNO<@s6OJ+WBx?~8g`gaK4x7dFcg1mp_CFoV)mw2^&pDYVJ|2*&wIDX&@HmSU` zi@0Ind$lN1BGstW`g82^8Z1%69CK6a{b{*Hw9wZ2Fv~6S4x8;E_$m197_)77&}<(J zIJqKxHh(`E^cBtE44Rp*)5iR^c3h`zJ;D#R^(OG@;Um&p1yjTOq_>8>y{!*D4OU>< z8t$1c6wdv#p)#-u&L-4997Un`^H^Yi666ja_d9@1!TT~-n$UzF2J<7dgYQfj@CPiV z$u|Cgr6hi-&ZGafpJDJK3)aA3HFh+L&7PWxaA!nfz~HpDI8N4x3CrssylsC$qR3;T zvEeiVsjzl&Y?PN;h-;SmxJEuv1M=hD_+0`t#hFHvjxY9r&!Hea=dr1MyKQ%HtoU}j z%2*mb{n#wcfr(?6q>RnlU|4~5b{z8oC-xw00et+qaBblrQp*#@1!w1?eO`Z!%!~K| D>pRN% literal 0 HcmV?d00001 diff --git a/include/wx/os2/folder1.ico b/include/wx/os2/folder1.ico new file mode 100644 index 0000000000000000000000000000000000000000..317fe37393a15e34caf16528f9871f48bd0b2823 GIT binary patch literal 4394 zcmeHJy>1gh5T5uF0v3{8xT3+L!Cg+W1QCS~f+(Os2vOw$s1YfQps{cf6rrR?JV7cR z;cDa}b(%Yo#+@T*EMz=?TNtn7 z`CcHp3A#*GTEYWh<`Mr{p!~AO-!R&~iZsAVm!V_FNmuEiC++c!xE^;-cU1M>ML5d(o?2|u}QF$r&`~kRaYQ_|g zDWExQ{|}#<(#McuGnawKL`%$Z01K;X%b)!il$eKe;-JJSYX5eohbS80z3C#$A zq46?smin9MRA3XMBL%xYv?=KO@QZ?>4|rD(&Aedz{#NE++e8TQ*s`HoM-_H^M_Igv zCT!rFy4K-{$VJvhZB(eH{=rr-c^I*EIp4XsPqgxis5HC);+&xZ^D)IZe-cgv2f%*9 z2Q&#|bQcL9Zl=)zaq^8gefLDZ_c34puC&b?0TzG~opHVxShQI#Ole7RB@?bK@t4r( z%G^Rrm-(-8n0CgeQ^K87fbP^>j^6MQYjV)|@PlY=?*u?@P0t*iMb2#78-8BN^>U6& z_pKM_e$xW-ao3T}rpqVRYJMJtmc5)v zJ}To*nhiM)aUZ?Ge}2Y&)UXbvBMnXjt#SJDDpyDrvke23n8g*F=24gI`%TTyQprL$9X zN*r2F;NakZA!m#w1XM;1Enj=vA%UV=*8Pv=Y$wFO7kmG zzO#5zl*jrXYyHxh#?=we@tYuvW9*~yAEKjoi3Ss*0{*`LmFV6f(Os;`{$E56agHj( zaSyxbTi|!+82ANsm3{mep&;yROtjuW0zZWX+5!9E13K^l!A^lgt3QJU(HygzXYM0= zPk@A^V49>hka#R26Pae52k>oYz3;@KoeE@moA&U)X8BS_H>-SarlrET5uU)<3) z%mAHE9#6`Ql8%F2p5wn*Njr=q03d2)#0Cx?_+f<*)%G#OF2U z1?^E2H2&iODzwdEW>%QL1!QrQwq%%%&RNnOK+S4(kUlrn6~#gq*hz};Pku9||2W7sR8Vh{x~yxL%U8W`G6I z`3dT9ABtS|0w@-Iu1RGv1yGk1uxFl13$H(o_Pzcz>b(9m>eZ)`(68_o|3_s$^2n0; z;rW34RJd9+Pb7x|`Etvk=LLTq!(GTADqQWfK7KU=RZu6fTzv{I$T;5Bm7HwvIlrVy z8au546BI>ZGQ5WJ*y$iK?8Jk}hOzpRpOZ^bWLEpslU_w48^w{{o~XDERb?PGmgBnW z%D7s0M}<~&RNg$Q?Z&yUzN$03ffXgpL8_G0U>VTtbZD*1QouA@W8seNELqcbW}*K< zK3${5Q0lZVh_&Uj+I92knlApNuGfw{)3lpd4Q|%=G!4n#%@R160pzq>8|)g0Y{m?0 zlw@9AlV`UJkApPzjt5wSdPkOFSj({fEp1}ffYR@(hNxcArtC%VT0c;snqL9O0sG(s zI`9Dt@Bt-yF4|A2A7U9x{+;#0Q?y(2Q0+kuFOk`#DX!3{gFY1H$`5b|;_fh|o0M^f zIbys-h=qko#s?rQDkk)$Dc)w;1w6@OPWn6vhU8R+bcV^y`XjKy}#}6yR$_NEbF?G9L z4ZB7z7Lc6P+MRA?!Kj(C5u-coagD)g)%-b-{pHHu z6b%QNO<@s6OJ+WBx?~8g`gaK4x7dFcg1mp_CFoV)mw2^&pDYVJ|2*&wIDX&@HmSU` zi@0Ind$lN1BGstW`g82^8Z1%69CK6a{b{*Hw9wZ2Fv~6S4x8;E_$m197_)77&}<(J zIJqKxHh(`E^cBtE44Rp*)5iR^c3h`zJ;D#R^(OG@;Um&p1yjTOq_>8>y{!*D4OU>< z8t$1c6wdv#p)#-u&L-4997Un`^H^Yi666ja_d9@1!TT~-n$UzF2J<7dgYQfj@CPiV z$u|Cgr6hi-&ZGafpJDJK3)aA3HFh+L&7PWxaA!nfz~HpDI8N4x3CrssylsC$qR3;T zvEeiVsjzl&Y?PN;h-;SmxJEuv1M=hD_+0`t#hFHvjxY9r&!Hea=dr1MyKQ%HtoU}j z%2*mb{n#wcfr(?6q>RnlU|4~5b{z8oC-xw00et+qaBblrQp*#@1!w1?eO`Z!%!~K| D>pRN% literal 0 HcmV?d00001 diff --git a/include/wx/os2/watch.ptr b/include/wx/os2/watch.ptr new file mode 100644 index 0000000000000000000000000000000000000000..d974fab54379c4695413c9b855f24671983764cc GIT binary patch literal 288 zcmW-av2DXJ6hxn70cK%9tkZ~_NI(`ykzrC8pklbs2FWP#1{uN11aW1!Fm(CnBZv?3 z-@SWzeF8E)CFU+}VWNo>k_0m}6SM`o3@L@Z3tJ1%zwq%kH^Y8v$F+1-In|$(^>r*7 z57X!Vy{I0tzK^M%Q&<0TJ6?y?ypO_sE-Lp1J0`$9?V%{R6+nWFi0n literal 0 HcmV?d00001 diff --git a/include/wx/os2/wx.dlg b/include/wx/os2/wx.dlg new file mode 100644 index 0000000000..8cfb267c77 --- /dev/null +++ b/include/wx/os2/wx.dlg @@ -0,0 +1,34 @@ +DLGINCLUDE 1 \\dev\\wx2\\wxwindows\\include\\wx\\os2\\wxrsc.h + +DLGTEMPLATE ID_RESIZEABLEDIALOG PRELOAD MOVEABLE DISCARDABLE +BEGIN + DIALOG "" ID_RESIZEABLEDIALOG 34, 22, 144, 75 + WS_SAVEBITS | FS_SIZEBORDER | FS_NOMOVEWITHOWNER, + FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU + BEGIN + END +END + +DLGTEMPLATE ID_CAPTIONDIALOG PRELOAD MOVEABLE DISCARDABLE +BEGIN + DIALOG "Dummy Dialog" ID_CAPTIONDIALOG 34, 22, 144, 75 + WS_SAVEBITS | FS_DLGBORDER | FS_NOMOVEWITHOWNER, + FCF_DLGBORDER | FCF_TITLEBAR | FCF_SYSMENU + BEGIN + END +END + +/* +////////////////////////////////////////////////////////////////////////////// +// Dummy dialog for dialog boxes without caption & with thin frame +////////////////////////////////////////////////////////////////////////////// +*/ +DLGTEMPLATE ID_NOCAPTIONDIALOG PRELOAD MOVEABLE DISCARDABLE +BEGIN + DIALOG "" ID_NOCAPTIONDIALOG 34, 22, 144, 75 + WS_SAVEBITS | FS_NOMOVEWITHOWNER, + FCF_BORDER + BEGIN + END +END + diff --git a/include/wx/os2/wx.rc b/include/wx/os2/wx.rc index 3cbaa827c4..34cc33c491 100644 --- a/include/wx/os2/wx.rc +++ b/include/wx/os2/wx.rc @@ -1,167 +1,84 @@ -///////////////////////////////////////////////////////////////////////////// -// File: wx.rc -// Purpose: wxWindows resource definitions. ALWAYS include -// this in your application resource file. -// -// wxWindows version 2.1.11 -// -// Author: David Webster -// Date: 11-21-99 -// -// Permission to use, copy, modify, and distribute this software and its -// documentation for any purpose is hereby granted without fee, provided -// that the above copyright notice, author statement and this permission -// notice appear in all copies of this software and related documentation. -// -// THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, -// IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF -// MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -// -// IN NO EVENT SHALL THE ARTIFICIAL INTELLIGENCE APPLICATIONS INSTITUTE OR THE -// UNIVERSITY OF EDINBURGH BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR -// CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM -// LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF -// DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH -// THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Version: $Id$ -///////////////////////////////////////////////////////////////////////////// - #include +#include "wxrsc.h" -////////////////////////////////////////////////////////////////////////////// -// -// Dummy Dialog for all wxCAPTION Dialog boxes -// +/* ////////////////////////////////////////////////////////////////////////////// -// // This is the MDI Window menu -// - -wxWindowMenu MENU DISCARDABLE +////////////////////////////////////////////////////////////////////////////// +*/ +MENU ID_WINDOW_MENU PRELOAD BEGIN - SUBMENU "&Window" + SUBMENU "~Window", 131 BEGIN - MENUITEM "&Cascade", 4002 - MENUITEM "Tile &Horizontally", 4001 - MENUITEM "Tile &Vertically", 4005 - MENUITEM "", 0, MIS_SEPARATOR - MENUITEM "&Arrange Icons", 4003 - MENUITEM "&Next", 4004 + MENUITEM "~Cascade", 132 + MENUITEM "Tile ~Horizontally", 133 + MENUITEM "Tile ~Vertically", 134 + MENUITEM "", -1 + MENUITEM "~Arrange Icons", 135 + MENUITEM "~Next", 136 END END +/* ////////////////////////////////////////////////////////////////////////////// -// -// Standard wxWindows Cursors -// - -POINTER WXCURSOR_HAND LOADONCALL "wx/os2/hand.ptr" -POINTER WXCURSOR_BULLSEYE LOADONCALL "wx/os2/bullseye.ptr" -POINTER WXCURSOR_PENCIL LOADONCALL "wx/os2/pencil.ptr" -POINTER WXCURSOR_MAGNIFIER LOADONCALL "wx/os2/magnif1.ptr" -POINTER WXCURSOR_NO_ENTRY LOADONCALL "wx/os2/noentry.ptr" -POINTER WXCURSOR_SIZING LOADONCALL "wx/os2/size.ptr" -POINTER WXCURSOR_ROLLER LOADONCALL "wx/os2/roller.ptr" -POINTER WXCURSOR_WATCH LOADONCALL "wx/os2/watch1.ptr" -POINTER WXCURSOR_PBRUSH LOADONCALL "wx/os2/pbrush.ptr" -POINTER WXCURSOR_PLEFT LOADONCALL "wx/os2/pntleft.ptr" -POINTER WXCURSOR_PRIGHT LOADONCALL "wx/os2/pntright.ptr" -POINTER WXCURSOR_QARROW LOADONCALL "wx/os2/query.ptr" -POINTER WXCURSOR_BLANK LOADONCALL "wx/os2/blank.ptr" +// Standard winWindows Cursors +////////////////////////////////////////////////////////////////////////////// +*/ + +POINTER WINCURSOR_HAND LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\hand.ptr" +POINTER WINCURSOR_BULLSEYE LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\bullseye.ptr" +POINTER WINCURSOR_PENCIL LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\pencil.ptr" +POINTER WINCURSOR_MAGNIFIER LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\magnit1.ptr" +POINTER WINCURSOR_NO_ENTRY LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\noentry.ptr" +POINTER WINCURSOR_SIZING LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\size.ptr" +POINTER WINCURSOR_ROLLER LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\roller.ptr" +POINTER WINCURSOR_WATCH LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\watch.ptr" +POINTER WINCURSOR_PBRUSH LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\pbrush.ptr" +POINTER WINCURSOR_PLEFT LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\pntleft.ptr" +POINTER WINCURSOR_PRIGHT LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\pntright.ptr" +POINTER WINCURSOR_QARROW LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\query.ptr" +POINTER WINCURSOR_BLANK LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\blank.ptr" +/* ////////////////////////////////////////////////////////////////////////////// -// // Default Icons -// - -//ICON wxDEFAULT_FRAME PRELOAD "wx/os2/std.ico" -//ICON wxDEFAULT_MDIPARENTFRAME PRELOAD "wx/os2/mdi.ico" -//ICON wxDEFAULT_MDICHILDFRAME PRELOAD "wx/os2/child.ico" - -// Standard icons -ICON wxICON_QUESTION PRELOAD "wx/os2/question.ico" -ICON wxICON_WARNING PRELOAD "wx/os2/warning.ico" -ICON wxICON_ERROR PRELOAD "wx/os2/error.ico" -ICON wxICON_INFO PRELOAD "wx/os2/info.ico" -ICON wxICON_TIP PRELOAD "wx/os2/tip.ico" +////////////////////////////////////////////////////////////////////////////// +*/ +/* Standard icons */ +ICON kICON_TIP PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\tip.ico" + +ICON kICON_SMALL_CLOSED_FOLDER PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\folder1.ico" +ICON kICON_SMALL_OPEN_FOLDER PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\folder2.ico" +ICON kICON_SMALL_FILE PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\file.ico" +ICON kICON_SMALL_COMPUTER PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\computer.ico" +ICON kICON_SMALL_DRIVE PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\drive.ico" +ICON kICON_SMALL_CDROM PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\cdrom.ico" +ICON kICON_SMALL_FLOPPY PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\floppy.ico" +ICON kICON_SMALL_REMOVEABLE PRELOAD "\\prj\\win\\code\\z00\\resource\\os2\\removble.ico" +/* ////////////////////////////////////////////////////////////////////////////// -// // Bitmaps -// - -BITMAP wxDISABLE_BUTTON_BITMAP LOADONCALL "wx/os2/disable.bmp" - - -// For src/generic/proplist.cpp -BITMAP tick_bmp LOADONCALL "wx/os2/tick.bmp" -BITMAP cross_bmp LOADONCALL "wx/os2/cross.bmp" - ////////////////////////////////////////////////////////////////////////////// -// -// Main Frame Window menu for wxWindows OS/2 -// -// OS/2 menues must be created from a resource file or binary menu template -// loaded from a resource file via a DosGetResource call. To keep interface -// compatability with other ports the default wxMenu constructor loads the -// below menu. Users can them add or delete menu items as they see fit in -// their own wxMenu derived classes or add them dynamically. -// - -MENU IDR_MAIN -{ - SUBMENU "~File", IDM_FILE, MIS_TEXT - { - MENUITEM "~New", IDM_FILENEW, MIS_TEXT - MENUITEM "~Open...\tCtrl+O", IDM_FILEOPEN, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "~Save...\tCtrl+O", IDM_FILESAVE, MIS_TEXT - MENUITEM "Save ~as...", IDM_FILESAVEAS, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "E~xit...", ID_CANCEL, MIS_TEXT - } - - SUBMENU "~Edit", IDM_EDIT, MIS_TEXT - { - MENUITEM "~Undo\tAlt+Backspace", IDM_EDITUNDO, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "Cu~t\tShift+Delete", IDM_EDITCUT, MIS_TEXT - MENUITEM "~Copy\tCtrl+Insert", IDM_EDITCOPY, MIS_TEXT - MENUITEM "~Paste\tShift+Insert", IDM_EDITPASTE, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "Cl~ear\tDelete", IDM_EDITCLEAR, MIS_TEXT - } +*/ +BITMAP kDISABLE_BUTTON_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\disable.bmp" /* - * Application specific menus go here. - */ - - SUBMENU "~Help", IDM_HELP, MIS_TEXT - { - MENUITEM "Help ~index", IDM_HELPINDEX, MIS_TEXT - MENUITEM "~General help", IDM_HELPGENERAL, MIS_TEXT - MENUITEM "~Using help", IDM_HELPUSINGHELP, MIS_TEXT - MENUITEM SEPARATOR - MENUITEM "~About", IDM_HELPABOUT, MIS_TEXT - } - -} +// For src/generic/proplist.cpp +*/ +BITMAP kTICK_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\tick.bmp" +BITMAP kCROSS_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\cross.bmp" -ACCELTABLE IDR_MAIN -{ - VK_BACKSPACE, IDM_EDITUNDO, VIRTUALKEY, ALT - VK_DELETE, IDM_EDITCUT, VIRTUALKEY, SHIFT - VK_INSERT, IDM_EDITCOPY, VIRTUALKEY, CONTROL - VK_INSERT, IDM_EDITPASTE, VIRTUALKEY, SHIFT - VK_DELETE, IDM_EDITCLEAR, VIRTUALKEY -} +/* +// For kContextHelpButton +*/ +BITMAP kCSQUERY_BITMAP LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\csquery.bmp" -STRINGTABLE -{ - IDS_OPEN "Open" - IDS_SAVE "Save" -} +/* +// For obtaining the RGB values of standard colours +*/ +BITMAP kBITMAP_STD_COLOURS LOADONCALL "\\prj\\win\\code\\z00\\resource\\os2\\colours.bmp" +RCINCLUDE "\DEV\WX2\WXWINDOWS\INCLUDE\WX\OS2\WX.DLG" diff --git a/include/wx/os2/wxos2.h b/include/wx/os2/wxos2.h deleted file mode 100644 index c5a5835cbc..0000000000 --- a/include/wx/os2/wxos2.h +++ /dev/null @@ -1,43 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wxOs2.h -// Purpose: OS/2 resource defines -// Author: David Webster -// Modified by: -// Created: 02/26/00 -// RCS-ID: $Id$ -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_OS2_H_ -#define _WX_OS2_H_ - -// -// These are defines of wxOS2's standard frame resources -// - -#define IDR_MAIN 1 - -#define IDM_FILENEW 2000 -#define IDM_FILEOPEN 2001 -#define IDM_FILESAVE 2002 -#define IDM_FILESAVEAS 2003 - -#define IDM_EDIT 3000 -#define IDM_EDITUNDO 3001 -#define IDM_EDITCUT 3002 -#define IDM_EDITCOPY 3003 -#define IDM_EDITPASTE 3004 -#define IDM_EDITCLEAR 3005 - -#define IDM_HELP 8000 -#define IDM_HELPINDEX 8001 -#define IDM_HELPGENERAL 8002 -#define IDM_HELPUSINGHELP 8003 -#define IDM_HELPABOUT 8004 - -#define IDS_OPEN 20000 -#define IDS_SAVE 20001 - -#endif // _WX_OS2_H_ - diff --git a/include/wx/os2/wxrsc.h b/include/wx/os2/wxrsc.h new file mode 100644 index 0000000000..e4f8f839d8 --- /dev/null +++ b/include/wx/os2/wxrsc.h @@ -0,0 +1,48 @@ +/* +// Pointer ID's +*/ +#define WXCURSOR_HAND 100 +#define WXCURSOR_BULLSEYE 101 +#define WXCURSOR_PENCIL 102 +#define WXCURSOR_MAGNIFIER 103 +#define WXCURSOR_NO_ENTRY 104 +#define WXCURSOR_SIZING 105 +#define WXCURSOR_ROLLER 106 +#define WXCURSOR_WATCH 107 +#define WXCURSOR_PBRUSH 108 +#define WXCURSOR_PLEFT 109 +#define WXCURSOR_PRIGHT 110 +#define WXCURSOR_QARROW 111 +#define WXCURSOR_BLANK 112 + +/* +// Icon Ids +*/ +#define wxICON_TIP 113 +#define wxICON_SMALL_CLOSED_FOLDER 114 +#define wxICON_SMALL_OPEN_FOLDER 115 +#define wxICON_SMALL_FILE 116 +#define wxICON_SMALL_COMPUTER 117 +#define wxICON_SMALL_DRIVE 118 +#define wxICON_SMALL_CDROM 119 +#define wxICON_SMALL_FLOPPY 120 +#define wxICON_SMALL_REMOVEABLE 121 + +/* +// Bitmap Ids +*/ +#define wxDISABLE_BUTTON_BITMAP 122 +#define wxTICK_BITMAP 123 +#define wxCROSS_BITMAP 124 +#define wxCSQUERY_BITMAP 125 +#define wxBITMAP_STD_COLOURS 126 + +/* +// Dialog Ids -- must match enums in Toplevel.cpp +*/ +#define ID_RESIZEABLEDIALOG 127 +#define ID_CAPTIONDIALOG 128 +#define ID_NOCAPTIONDIALOG 129 + +#define ID_WINDDOW_MENU 130 + -- 2.45.2