From: David Webster Date: Wed, 4 Sep 2002 13:39:02 +0000 (+0000) Subject: For OS/2 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f0b47621e9dac8973da428f623fafd18b46ee046 For OS/2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/checklst/checklst.rcO b/samples/checklst/checklst.rcO new file mode 100644 index 0000000000..62b693ce9e --- /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/checklst/makefile.va b/samples/checklst/makefile.va new file mode 100644 index 0000000000..8b31fced72 --- /dev/null +++ b/samples/checklst/makefile.va @@ -0,0 +1,44 @@ +# +# File: makefile.va +# Author: David Webster +# Created: 1999 +# Updated: +# Copyright: (c) David Webster +# +# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR=$(WXWIN) + +!include $(WXDIR)\src\makeva.env + +# +# Define which program this is and what it's path is and where to output to +# +PROGRAM=checklst +THISDIR=$(WXWIN)\samples\$(PROGRAM) +OPATH=$(THISDIR)\$D + +# +# Make sure output directory is available +# +!if [md $(OPATH)] +!endif + +# +# Standard definitions +# +PROGRC=$(THISDIR)\$(PROGRAM).rcO +OBJECTS=$(OPATH)\$(PROGRAM).obj +PROGRES=$(OPATH)\$(PROGRAM).res +PROGTARGET=E:\TEMP\$(PROGRAM).exe + +.cpp{$OPATH}.obj: + @echo $< + icc @<< +$(CPPFLAGS) /Fo$@ /Tp $< +<< + +!include $(WXDIR)\src\makeprog.va + diff --git a/samples/checklst/mondros2.ico b/samples/checklst/mondros2.ico new file mode 100644 index 0000000000..8b0e58c0d7 Binary files /dev/null and b/samples/checklst/mondros2.ico differ diff --git a/samples/dialogs/dialogs.rcO b/samples/dialogs/dialogs.rcO new file mode 100644 index 0000000000..87a8a25faa --- /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/dialogs/makefile.va b/samples/dialogs/makefile.va new file mode 100644 index 0000000000..b0d90dd816 --- /dev/null +++ b/samples/dialogs/makefile.va @@ -0,0 +1,44 @@ +# +# File: makefile.va +# Author: David Webster +# Created: 1999 +# Updated: +# Copyright: (c) David Webster +# +# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR=$(WXWIN) + +!include $(WXDIR)\src\makeva.env + +# +# Define which program this is and what it's path is and where to output to +# +PROGRAM=dialogs +THISDIR=$(WXWIN)\samples\$(PROGRAM) +OPATH=$(THISDIR)\$D + +# +# Make sure output directory is available +# +!if [md $(OPATH)] +!endif + +# +# Standard definitions +# +PROGRC=$(THISDIR)\$(PROGRAM).rcO +OBJECTS=$(OPATH)\$(PROGRAM).obj +PROGRES=$(OPATH)\$(PROGRAM).res +PROGTARGET=E:\TEMP\$(PROGRAM).exe + +.cpp{$OPATH}.obj: + @echo $< + icc @<< +$(CPPFLAGS) /Fo$@ /Tp $< +<< + +!include $(WXDIR)\src\makeprog.va + diff --git a/samples/image/image.rco b/samples/image/image.rco new file mode 100644 index 0000000000..87a8a25faa --- /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/image/makefile.va b/samples/image/makefile.va new file mode 100644 index 0000000000..2a125665f2 --- /dev/null +++ b/samples/image/makefile.va @@ -0,0 +1,44 @@ +# +# File: makefile.va +# Author: David Webster +# Created: 1999 +# Updated: +# Copyright: (c) David Webster +# +# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR=$(WXWIN) + +!include $(WXDIR)\src\makeva.env + +# +# Define which program this is and what it's path is and where to output to +# +PROGRAM=image +THISDIR=$(WXWIN)\samples\$(PROGRAM) +OPATH=$(THISDIR)\$D + +# +# Make sure output directory is available +# +!if [md $(OPATH)] +!endif + +# +# Standard definitions +# +PROGRC=$(THISDIR)\$(PROGRAM).rcO +OBJECTS=$(OPATH)\$(PROGRAM).obj +PROGRES=$(OPATH)\$(PROGRAM).res +PROGTARGET=E:\TEMP\$(PROGRAM).exe + +.cpp{$OPATH}.obj: + @echo $< + icc @<< +$(CPPFLAGS) /Fo$@ /Tp $< +<< + +!include $(WXDIR)\src\makeprog.va + diff --git a/samples/menu/makefile.va b/samples/menu/makefile.va index 3081148205..2096135b7a 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 adffb27a10..fd3e754017 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 3d546d4916..412a762880 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/notebook/makefile.va b/samples/notebook/makefile.va new file mode 100644 index 0000000000..7d6e405454 --- /dev/null +++ b/samples/notebook/makefile.va @@ -0,0 +1,44 @@ +# +# File: makefile.va +# Author: David Webster +# Created: 1999 +# Updated: +# Copyright: (c) David Webster +# +# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR=$(WXWIN) + +!include $(WXDIR)\src\makeva.env + +# +# Define which program this is and what it's path is and where to output to +# +PROGRAM=notebook +THISDIR=$(WXWIN)\samples\$(PROGRAM) +OPATH=$(THISDIR)\$D + +# +# Make sure output directory is available +# +!if [md $(OPATH)] +!endif + +# +# Standard definitions +# +PROGRC=$(THISDIR)\$(PROGRAM).rcO +OBJECTS=$(OPATH)\$(PROGRAM).obj +PROGRES=$(OPATH)\$(PROGRAM).res +PROGTARGET=E:\TEMP\$(PROGRAM).exe + +.cpp{$OPATH}.obj: + @echo $< + icc @<< +$(CPPFLAGS) /Fo$@ /Tp $< +<< + +!include $(WXDIR)\src\makeprog.va + diff --git a/samples/notebook/mondros2.ico b/samples/notebook/mondros2.ico new file mode 100644 index 0000000000..8b0e58c0d7 Binary files /dev/null and b/samples/notebook/mondros2.ico differ diff --git a/samples/notebook/notebook.rcO b/samples/notebook/notebook.rcO new file mode 100644 index 0000000000..62b693ce9e --- /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 4a05a83f97..fb654a5ca1 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/toolbar/makefile.va b/samples/toolbar/makefile.va new file mode 100644 index 0000000000..88a87864bc --- /dev/null +++ b/samples/toolbar/makefile.va @@ -0,0 +1,44 @@ +# +# File: makefile.va +# Author: David Webster +# Created: 1999 +# Updated: +# Copyright: (c) David Webster +# +# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR=$(WXWIN) + +!include $(WXDIR)\src\makeva.env + +# +# Define which program this is and what it's path is and where to output to +# +PROGRAM=tbar +THISDIR=$(WXWIN)\samples\$(PROGRAM) +OPATH=$(THISDIR)\$D + +# +# Make sure output directory is available +# +!if [md $(OPATH)] +!endif + +# +# Standard definitions +# +PROGRC=$(THISDIR)\$(PROGRAM).rcO +OBJECTS=$(OPATH)\$(PROGRAM).obj +PROGRES=$(OPATH)\$(PROGRAM).res +PROGTARGET=E:\TEMP\$(PROGRAM).exe + +.cpp{$OPATH}.obj: + @echo $< + icc @<< +$(CPPFLAGS) /Fo$@ /Tp $< +<< + +!include $(WXDIR)\src\makeprog.va + diff --git a/samples/toolbar/mondros2.ico b/samples/toolbar/mondros2.ico new file mode 100644 index 0000000000..8b0e58c0d7 Binary files /dev/null and b/samples/toolbar/mondros2.ico differ diff --git a/samples/toolbar/toolbar.rco b/samples/toolbar/toolbar.rco new file mode 100644 index 0000000000..21e4973f49 --- /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 +