From f0b47621e9dac8973da428f623fafd18b46ee046 Mon Sep 17 00:00:00 2001 From: David Webster Date: Wed, 4 Sep 2002 13:39:02 +0000 Subject: [PATCH] For OS/2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/checklst/checklst.rcO | 4 ++++ samples/{menu => checklst}/makefile.va | 4 ++-- samples/checklst/mondros2.ico | Bin 0 -> 996 bytes samples/dialogs/dialogs.rcO | 4 ++++ samples/{menu => dialogs}/makefile.va | 4 ++-- samples/image/image.rco | 4 ++++ samples/{menu => image}/makefile.va | 4 ++-- samples/menu/makefile.va | 2 +- samples/minimal/makefile.va | 2 +- samples/minimal/minimal.rcO | 2 +- samples/{menu => notebook}/makefile.va | 4 ++-- samples/notebook/mondros2.ico | Bin 0 -> 996 bytes samples/notebook/notebook.rcO | 4 ++++ samples/scroll/makefile.va | 2 +- samples/{menu => toolbar}/makefile.va | 4 ++-- samples/toolbar/mondros2.ico | Bin 0 -> 996 bytes samples/toolbar/toolbar.rco | 13 +++++++++++++ 17 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 samples/checklst/checklst.rcO copy samples/{menu => checklst}/makefile.va (93%) create mode 100644 samples/checklst/mondros2.ico create mode 100644 samples/dialogs/dialogs.rcO copy samples/{menu => dialogs}/makefile.va (93%) create mode 100644 samples/image/image.rco copy samples/{menu => image}/makefile.va (94%) copy samples/{menu => notebook}/makefile.va (93%) create mode 100644 samples/notebook/mondros2.ico create mode 100644 samples/notebook/notebook.rcO copy samples/{menu => toolbar}/makefile.va (94%) create mode 100644 samples/toolbar/mondros2.ico create mode 100644 samples/toolbar/toolbar.rco diff --git a/samples/checklst/checklst.rcO b/samples/checklst/checklst.rcO new file mode 100644 index 0000000..62b693c --- /dev/null +++ b/samples/checklst/checklst.rcO @@ -0,0 +1,4 @@ +ICON 1 PRELOAD "mondros2.ico" + +RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc + diff --git a/samples/menu/makefile.va b/samples/checklst/makefile.va similarity index 93% copy from samples/menu/makefile.va copy to samples/checklst/makefile.va index 3081148..8b31fce 100644 --- a/samples/menu/makefile.va +++ b/samples/checklst/makefile.va @@ -16,7 +16,7 @@ WXDIR=$(WXWIN) # # Define which program this is and what it's path is and where to output to # -PROGRAM=menu +PROGRAM=checklst THISDIR=$(WXWIN)\samples\$(PROGRAM) OPATH=$(THISDIR)\$D @@ -32,7 +32,7 @@ OPATH=$(THISDIR)\$D PROGRC=$(THISDIR)\$(PROGRAM).rcO OBJECTS=$(OPATH)\$(PROGRAM).obj PROGRES=$(OPATH)\$(PROGRAM).res -PROGTARGET=$(OPATH)\$(PROGRAM).exe +PROGTARGET=E:\TEMP\$(PROGRAM).exe .cpp{$OPATH}.obj: @echo $< diff --git a/samples/checklst/mondros2.ico b/samples/checklst/mondros2.ico new file mode 100644 index 0000000000000000000000000000000000000000..8b0e58c0d7ba2fc9e51c6fa8bd97f4e77a23c9ad GIT binary patch literal 996 zcmZ?v^kZOP5CFm_K-vL_6`(XD10#@y379a2P(=R!|IgrzFcoNs15jQ8iWwPLfGpBM z14s*yXn-;rpqvJvz?m~=82*FgfdtTUFylXz19HtMKn(%@|NlR{0|TyAtN8zapf(@H sHmLc)cz}SR#s_)^6h1KL|L2@JfmA+9cmO#(XU-gen+G(T+I)2T0H9%&e*gdg literal 0 HcmV?d00001 diff --git a/samples/dialogs/dialogs.rcO b/samples/dialogs/dialogs.rcO new file mode 100644 index 0000000..87a8a25 --- /dev/null +++ b/samples/dialogs/dialogs.rcO @@ -0,0 +1,4 @@ +ICON 1 PRELOAD "dialogs.ico" + +RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc + diff --git a/samples/menu/makefile.va b/samples/dialogs/makefile.va similarity index 93% copy from samples/menu/makefile.va copy to samples/dialogs/makefile.va index 3081148..b0d90dd 100644 --- a/samples/menu/makefile.va +++ b/samples/dialogs/makefile.va @@ -16,7 +16,7 @@ WXDIR=$(WXWIN) # # Define which program this is and what it's path is and where to output to # -PROGRAM=menu +PROGRAM=dialogs THISDIR=$(WXWIN)\samples\$(PROGRAM) OPATH=$(THISDIR)\$D @@ -32,7 +32,7 @@ OPATH=$(THISDIR)\$D PROGRC=$(THISDIR)\$(PROGRAM).rcO OBJECTS=$(OPATH)\$(PROGRAM).obj PROGRES=$(OPATH)\$(PROGRAM).res -PROGTARGET=$(OPATH)\$(PROGRAM).exe +PROGTARGET=E:\TEMP\$(PROGRAM).exe .cpp{$OPATH}.obj: @echo $< diff --git a/samples/image/image.rco b/samples/image/image.rco new file mode 100644 index 0000000..87a8a25 --- /dev/null +++ b/samples/image/image.rco @@ -0,0 +1,4 @@ +ICON 1 PRELOAD "dialogs.ico" + +RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc + diff --git a/samples/menu/makefile.va b/samples/image/makefile.va similarity index 94% copy from samples/menu/makefile.va copy to samples/image/makefile.va index 3081148..2a12566 100644 --- a/samples/menu/makefile.va +++ b/samples/image/makefile.va @@ -16,7 +16,7 @@ WXDIR=$(WXWIN) # # Define which program this is and what it's path is and where to output to # -PROGRAM=menu +PROGRAM=image THISDIR=$(WXWIN)\samples\$(PROGRAM) OPATH=$(THISDIR)\$D @@ -32,7 +32,7 @@ OPATH=$(THISDIR)\$D PROGRC=$(THISDIR)\$(PROGRAM).rcO OBJECTS=$(OPATH)\$(PROGRAM).obj PROGRES=$(OPATH)\$(PROGRAM).res -PROGTARGET=$(OPATH)\$(PROGRAM).exe +PROGTARGET=E:\TEMP\$(PROGRAM).exe .cpp{$OPATH}.obj: @echo $< diff --git a/samples/menu/makefile.va b/samples/menu/makefile.va index 3081148..2096135 100644 --- a/samples/menu/makefile.va +++ b/samples/menu/makefile.va @@ -32,7 +32,7 @@ OPATH=$(THISDIR)\$D PROGRC=$(THISDIR)\$(PROGRAM).rcO OBJECTS=$(OPATH)\$(PROGRAM).obj PROGRES=$(OPATH)\$(PROGRAM).res -PROGTARGET=$(OPATH)\$(PROGRAM).exe +PROGTARGET=E:\TEMP\$(PROGRAM).exe .cpp{$OPATH}.obj: @echo $< diff --git a/samples/minimal/makefile.va b/samples/minimal/makefile.va index adffb27..fd3e754 100644 --- a/samples/minimal/makefile.va +++ b/samples/minimal/makefile.va @@ -32,7 +32,7 @@ OPATH=$(THISDIR)\$D PROGRC=$(THISDIR)\$(PROGRAM).rcO OBJECTS=$(OPATH)\$(PROGRAM).obj PROGRES=$(OPATH)\$(PROGRAM).res -PROGTARGET=$(OPATH)\$(PROGRAM).exe +PROGTARGET=E:\TEMP\$(PROGRAM).exe .cpp{$OPATH}.obj: @echo $< diff --git a/samples/minimal/minimal.rcO b/samples/minimal/minimal.rcO index 3d546d4..412a762 100644 --- a/samples/minimal/minimal.rcO +++ b/samples/minimal/minimal.rcO @@ -1,5 +1,5 @@ ICON 1 PRELOAD "mondros2.ico" -#include "wx/os2/wx.rc" +RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc #define MINIMAL_QUIT 1 #define MINIMAL_ABOUT 102 diff --git a/samples/menu/makefile.va b/samples/notebook/makefile.va similarity index 93% copy from samples/menu/makefile.va copy to samples/notebook/makefile.va index 3081148..7d6e405 100644 --- a/samples/menu/makefile.va +++ b/samples/notebook/makefile.va @@ -16,7 +16,7 @@ WXDIR=$(WXWIN) # # Define which program this is and what it's path is and where to output to # -PROGRAM=menu +PROGRAM=notebook THISDIR=$(WXWIN)\samples\$(PROGRAM) OPATH=$(THISDIR)\$D @@ -32,7 +32,7 @@ OPATH=$(THISDIR)\$D PROGRC=$(THISDIR)\$(PROGRAM).rcO OBJECTS=$(OPATH)\$(PROGRAM).obj PROGRES=$(OPATH)\$(PROGRAM).res -PROGTARGET=$(OPATH)\$(PROGRAM).exe +PROGTARGET=E:\TEMP\$(PROGRAM).exe .cpp{$OPATH}.obj: @echo $< diff --git a/samples/notebook/mondros2.ico b/samples/notebook/mondros2.ico new file mode 100644 index 0000000000000000000000000000000000000000..8b0e58c0d7ba2fc9e51c6fa8bd97f4e77a23c9ad GIT binary patch literal 996 zcmZ?v^kZOP5CFm_K-vL_6`(XD10#@y379a2P(=R!|IgrzFcoNs15jQ8iWwPLfGpBM z14s*yXn-;rpqvJvz?m~=82*FgfdtTUFylXz19HtMKn(%@|NlR{0|TyAtN8zapf(@H sHmLc)cz}SR#s_)^6h1KL|L2@JfmA+9cmO#(XU-gen+G(T+I)2T0H9%&e*gdg literal 0 HcmV?d00001 diff --git a/samples/notebook/notebook.rcO b/samples/notebook/notebook.rcO new file mode 100644 index 0000000..62b693c --- /dev/null +++ b/samples/notebook/notebook.rcO @@ -0,0 +1,4 @@ +ICON 1 PRELOAD "mondros2.ico" + +RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc + diff --git a/samples/scroll/makefile.va b/samples/scroll/makefile.va index 4a05a83..fb654a5 100644 --- a/samples/scroll/makefile.va +++ b/samples/scroll/makefile.va @@ -32,7 +32,7 @@ OPATH=$(THISDIR)\$D PROGRC=$(THISDIR)\$(PROGRAM).rcO OBJECTS=$(OPATH)\$(PROGRAM).obj PROGRES=$(OPATH)\$(PROGRAM).res -PROGTARGET=$(OPATH)\$(PROGRAM).exe +PROGTARGET=E:\TEMP\$(PROGRAM).exe .cpp{$OPATH}.obj: @echo $< diff --git a/samples/menu/makefile.va b/samples/toolbar/makefile.va similarity index 94% copy from samples/menu/makefile.va copy to samples/toolbar/makefile.va index 3081148..88a8786 100644 --- a/samples/menu/makefile.va +++ b/samples/toolbar/makefile.va @@ -16,7 +16,7 @@ WXDIR=$(WXWIN) # # Define which program this is and what it's path is and where to output to # -PROGRAM=menu +PROGRAM=tbar THISDIR=$(WXWIN)\samples\$(PROGRAM) OPATH=$(THISDIR)\$D @@ -32,7 +32,7 @@ OPATH=$(THISDIR)\$D PROGRC=$(THISDIR)\$(PROGRAM).rcO OBJECTS=$(OPATH)\$(PROGRAM).obj PROGRES=$(OPATH)\$(PROGRAM).res -PROGTARGET=$(OPATH)\$(PROGRAM).exe +PROGTARGET=E:\TEMP\$(PROGRAM).exe .cpp{$OPATH}.obj: @echo $< diff --git a/samples/toolbar/mondros2.ico b/samples/toolbar/mondros2.ico new file mode 100644 index 0000000000000000000000000000000000000000..8b0e58c0d7ba2fc9e51c6fa8bd97f4e77a23c9ad GIT binary patch literal 996 zcmZ?v^kZOP5CFm_K-vL_6`(XD10#@y379a2P(=R!|IgrzFcoNs15jQ8iWwPLfGpBM z14s*yXn-;rpqvJvz?m~=82*FgfdtTUFylXz19HtMKn(%@|NlR{0|TyAtN8zapf(@H sHmLc)cz}SR#s_)^6h1KL|L2@JfmA+9cmO#(XU-gen+G(T+I)2T0H9%&e*gdg literal 0 HcmV?d00001 diff --git a/samples/toolbar/toolbar.rco b/samples/toolbar/toolbar.rco new file mode 100644 index 0000000..21e4973 --- /dev/null +++ b/samples/toolbar/toolbar.rco @@ -0,0 +1,13 @@ +ICON 1 PRELOAD "mondros2.ico" + +BITMAP 2000 LOADONCALL "bitmaps\\new.bmp" +BITMAP 2001 LOADONCALL "bitmaps\\open.bmp" +BITMAP 2002 LOADONCALL "bitmaps\\save.bmp" +BITMAP 2003 LOADONCALL "bitmaps\\copy.bmp" +BITMAP 2004 LOADONCALL "bitmaps\\cut.bmp" +BITMAP 2005 LOADONCALL "bitmaps\\paste.bmp" +BITMAP 2006 LOADONCALL "bitmaps\\print.bmp" +BITMAP 2007 LOADONCALL "bitmaps\\help.bmp" + +RCINCLUDE \dev\wx2\WxWindows\include\wx\os2\wx.rc + -- 2.7.4