From a2641c8d27eca2b8ca8d2d0a8c315752fbdd85f1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 May 2009 16:42:51 +0000
Subject: [PATCH] added power, svg, taborder and xrc samples (closes #10849)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
samples/makefile.bcc | 82 ++++++++++++++++++++++++++++++++------------
samples/makefile.gcc | 47 +++++++++++++++++--------
samples/makefile.vc | 58 ++++++++++++++++++++++++-------
samples/makefile.wat | 58 ++++++++++++++++++++++++-------
samples/samples.bkl | 8 +++--
5 files changed, 189 insertions(+), 64 deletions(-)
diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index 8a5b492005..257e1b4ca6 100644
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -44,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
### Targets: ###
-all: access animate artprov aui calendar caret clipboard collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer
+all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc
clean:
-if exist .\*.obj del .\*.obj
@@ -82,14 +82,14 @@ clean:
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>collpane.bat
call collpane.bat
@del collpane.bat
- @echo cd config >config.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat
- call config.bat
- @del config.bat
@echo cd combo >combo.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>combo.bat
call combo.bat
@del combo.bat
+ @echo cd config >config.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat
+ call config.bat
+ @del config.bat
@echo cd console >console.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>console.bat
call console.bat
@@ -138,14 +138,14 @@ clean:
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>event.bat
call event.bat
@del event.bat
- @echo cd exec >exec.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>exec.bat
- call exec.bat
- @del exec.bat
@echo cd except >except.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>except.bat
call except.bat
@del except.bat
+ @echo cd exec >exec.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>exec.bat
+ call exec.bat
+ @del exec.bat
@echo cd font >font.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>font.bat
call font.bat
@@ -234,6 +234,10 @@ clean:
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>popup.bat
call popup.bat
@del popup.bat
+ @echo cd power >power.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>power.bat
+ call power.bat
+ @del power.bat
@echo cd printing >printing.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat
call printing.bat
@@ -290,6 +294,14 @@ clean:
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>stc.bat
call stc.bat
@del stc.bat
+ @echo cd svg >svg.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>svg.bat
+ call svg.bat
+ @del svg.bat
+ @echo cd taborder >taborder.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taborder.bat
+ call taborder.bat
+ @del taborder.bat
@echo cd taskbar >taskbar.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taskbar.bat
call taskbar.bat
@@ -334,6 +346,10 @@ clean:
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wrapsizer.bat
call wrapsizer.bat
@del wrapsizer.bat
+ @echo cd xrc >xrc.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>xrc.bat
+ call xrc.bat
+ @del xrc.bat
@echo cd memcheck >memcheck.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat
call memcheck.bat
@@ -387,18 +403,18 @@ collpane:
call collpane.bat
@del collpane.bat
-config:
- @echo cd config >config.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>config.bat
- call config.bat
- @del config.bat
-
combo:
@echo cd combo >combo.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>combo.bat
call combo.bat
@del combo.bat
+config:
+ @echo cd config >config.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>config.bat
+ call config.bat
+ @del config.bat
+
console:
@echo cd console >console.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>console.bat
@@ -471,18 +487,18 @@ event:
call event.bat
@del event.bat
-exec:
- @echo cd exec >exec.bat
- @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>exec.bat
- call exec.bat
- @del exec.bat
-
except:
@echo cd except >except.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat
call except.bat
@del except.bat
+exec:
+ @echo cd exec >exec.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>exec.bat
+ call exec.bat
+ @del exec.bat
+
font:
@echo cd font >font.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>font.bat
@@ -615,6 +631,12 @@ popup:
call popup.bat
@del popup.bat
+power:
+ @echo cd power >power.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>power.bat
+ call power.bat
+ @del power.bat
+
printing:
@echo cd printing >printing.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat
@@ -699,6 +721,18 @@ stc:
call stc.bat
@del stc.bat
+svg:
+ @echo cd svg >svg.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>svg.bat
+ call svg.bat
+ @del svg.bat
+
+taborder:
+ @echo cd taborder >taborder.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taborder.bat
+ call taborder.bat
+ @del taborder.bat
+
taskbar:
@echo cd taskbar >taskbar.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taskbar.bat
@@ -765,6 +799,12 @@ wrapsizer:
call wrapsizer.bat
@del wrapsizer.bat
+xrc:
+ @echo cd xrc >xrc.bat
+ @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat
+ call xrc.bat
+ @del xrc.bat
+
memcheck:
@echo cd memcheck >memcheck.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat
diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 121b3b4363..b99513064a 100644
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -35,7 +35,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
### Targets: ###
-all: access animate artprov aui calendar caret clipboard collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer
+all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc
clean:
-if exist .\*.o del .\*.o
@@ -48,8 +48,8 @@ clean:
$(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) clean
- $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean
@@ -62,8 +62,8 @@ clean:
$(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C erase -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C event -f makefile.gcc $(MAKEARGS) clean
- $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C except -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C font -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C grid -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean
@@ -86,6 +86,7 @@ clean:
$(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C power -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
@@ -100,6 +101,8 @@ clean:
$(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C stc -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C text -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C thread -f makefile.gcc $(MAKEARGS) clean
@@ -111,6 +114,7 @@ clean:
$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean
+ $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
access:
@@ -137,12 +141,12 @@ clipboard:
collpane:
$(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all
-config:
- $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all
-
combo:
$(MAKE) -C combo -f makefile.gcc $(MAKEARGS) all
+config:
+ $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all
+
console:
$(MAKE) -C console -f makefile.gcc $(MAKEARGS) all
@@ -179,12 +183,12 @@ erase:
event:
$(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
-exec:
- $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
-
except:
$(MAKE) -C except -f makefile.gcc $(MAKEARGS) all
+exec:
+ $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
+
font:
$(MAKE) -C font -f makefile.gcc $(MAKEARGS) all
@@ -251,6 +255,9 @@ ownerdrw:
popup:
$(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all
+power:
+ $(MAKE) -C power -f makefile.gcc $(MAKEARGS) all
+
printing:
$(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
@@ -293,6 +300,12 @@ statbar:
stc:
$(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all
+svg:
+ $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all
+
+taborder:
+ $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) all
+
taskbar:
$(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all
@@ -326,16 +339,20 @@ wizard:
wrapsizer:
$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
+xrc:
+ $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all
+
memcheck:
$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
-.PHONY: all clean access animate artprov aui calendar caret clipboard collpane config \
- combo console controls dataview dialogs dialup display dnd docview dragimag \
- drawing erase event exec except font grid help htlbox html image internat ipc joytest \
+.PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \
+ config console controls dataview dialogs dialup display dnd docview dragimag \
+ drawing erase event except exec font grid help htlbox html image internat ipc joytest \
keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \
- opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll \
- shaped sockets sound splash splitter statbar stc taskbar text thread toolbar \
- treectrl typetest validate vscroll widgets wizard wrapsizer memcheck
+ opengl ownerdrw popup power printing propgrid regtest render richtext sashtest \
+ scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text \
+ thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc \
+ memcheck
SHELL := $(COMSPEC)
diff --git a/samples/makefile.vc b/samples/makefile.vc
index cc02b95438..833a34fc51 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
### Targets: ###
-all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_propgrid sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer
+all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_printing sub_propgrid sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_xrc
clean:
-if exist .\*.obj del .\*.obj
@@ -64,10 +64,10 @@ clean:
cd collpane
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
- cd config
+ cd combo
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
- cd combo
+ cd config
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
cd console
@@ -106,10 +106,10 @@ clean:
cd event
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
- cd exec
+ cd except
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
- cd except
+ cd exec
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
cd font
@@ -178,6 +178,9 @@ clean:
cd popup
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
+ cd power
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
cd printing
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
@@ -220,6 +223,12 @@ clean:
cd stc
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
+ cd svg
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
+ cd taborder
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
cd taskbar
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
@@ -253,6 +262,9 @@ clean:
cd wrapsizer
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
+ cd xrc
+ $(MAKE) -f makefile.vc $(MAKEARGS) clean
+ cd "$(MAKEDIR)"
cd flash
$(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)"
@@ -303,13 +315,13 @@ sub_collpane:
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
-sub_config:
- cd config
+sub_combo:
+ cd combo
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
-sub_combo:
- cd combo
+sub_config:
+ cd config
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
@@ -373,13 +385,13 @@ sub_event:
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
-sub_exec:
- cd exec
+sub_except:
+ cd except
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
-sub_except:
- cd except
+sub_exec:
+ cd exec
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
@@ -493,6 +505,11 @@ sub_popup:
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
+sub_power:
+ cd power
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
sub_printing:
cd printing
$(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -563,6 +580,16 @@ sub_stc:
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
+sub_svg:
+ cd svg
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
+sub_taborder:
+ cd taborder
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
sub_taskbar:
cd taskbar
$(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -618,6 +645,11 @@ sub_wrapsizer:
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)"
+sub_xrc:
+ cd xrc
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd "$(MAKEDIR)"
+
sub_flash:
cd flash
$(MAKE) -f makefile.vc $(MAKEARGS) all
diff --git a/samples/makefile.wat b/samples/makefile.wat
index 0bcb7b0581..3f581c8989 100644
--- a/samples/makefile.wat
+++ b/samples/makefile.wat
@@ -52,7 +52,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
### Targets: ###
-all : .SYMBOLIC access animate artprov aui calendar caret clipboard collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer
+all : .SYMBOLIC access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc
clean : .SYMBOLIC
-if exist .\*.obj del .\*.obj
@@ -84,10 +84,10 @@ clean : .SYMBOLIC
cd collpane
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
- cd config
+ cd combo
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
- cd combo
+ cd config
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
cd console
@@ -126,10 +126,10 @@ clean : .SYMBOLIC
cd event
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
- cd exec
+ cd except
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
- cd except
+ cd exec
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
cd font
@@ -198,6 +198,9 @@ clean : .SYMBOLIC
cd popup
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
+ cd power
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+ cd $(WATCOM_CWD)
cd printing
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
@@ -240,6 +243,12 @@ clean : .SYMBOLIC
cd stc
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
+ cd svg
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+ cd $(WATCOM_CWD)
+ cd taborder
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+ cd $(WATCOM_CWD)
cd taskbar
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
@@ -273,6 +282,9 @@ clean : .SYMBOLIC
cd wrapsizer
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
+ cd xrc
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+ cd $(WATCOM_CWD)
cd memcheck
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
@@ -317,13 +329,13 @@ collpane : .SYMBOLIC
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
-config : .SYMBOLIC
- cd config
+combo : .SYMBOLIC
+ cd combo
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
-combo : .SYMBOLIC
- cd combo
+config : .SYMBOLIC
+ cd config
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
@@ -387,13 +399,13 @@ event : .SYMBOLIC
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
-exec : .SYMBOLIC
- cd exec
+except : .SYMBOLIC
+ cd except
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
-except : .SYMBOLIC
- cd except
+exec : .SYMBOLIC
+ cd exec
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
@@ -507,6 +519,11 @@ popup : .SYMBOLIC
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
+power : .SYMBOLIC
+ cd power
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+ cd $(WATCOM_CWD)
+
printing : .SYMBOLIC
cd printing
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
@@ -577,6 +594,16 @@ stc : .SYMBOLIC
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
+svg : .SYMBOLIC
+ cd svg
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+ cd $(WATCOM_CWD)
+
+taborder : .SYMBOLIC
+ cd taborder
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+ cd $(WATCOM_CWD)
+
taskbar : .SYMBOLIC
cd taskbar
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
@@ -632,6 +659,11 @@ wrapsizer : .SYMBOLIC
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
+xrc : .SYMBOLIC
+ cd xrc
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+ cd $(WATCOM_CWD)
+
memcheck : .SYMBOLIC
cd memcheck
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
diff --git a/samples/samples.bkl b/samples/samples.bkl
index 04e5ab7741..a8c41e5e86 100644
--- a/samples/samples.bkl
+++ b/samples/samples.bkl
@@ -21,8 +21,8 @@
<subproject id="caret" template="sub"/>
<subproject id="clipboard" template="sub"/>
<subproject id="collpane" template="sub"/>
- <subproject id="config" template="sub"/>
<subproject id="combo" template="sub"/>
+ <subproject id="config" template="sub"/>
<subproject id="console" template="sub"/>
<subproject id="controls" template="sub"/>
<subproject id="dataview" template="sub"/>
@@ -35,8 +35,8 @@
<subproject id="drawing" template="sub"/>
<subproject id="erase" template="sub"/>
<subproject id="event" template="sub"/>
- <subproject id="exec" template="sub"/>
<subproject id="except" template="sub"/>
+ <subproject id="exec" template="sub"/>
<subproject id="font" template="sub"/>
<subproject id="grid" template="sub"/>
<subproject id="help" template="sub"/>
@@ -59,6 +59,7 @@
<subproject id="opengl" template="sub"/>
<subproject id="ownerdrw" template="sub"/>
<subproject id="popup" template="sub"/>
+ <subproject id="power" template="sub"/>
<subproject id="printing" template="sub"/>
<subproject id="propgrid" template="sub"/>
<subproject id="regtest" template="sub"/>
@@ -73,6 +74,8 @@
<subproject id="splitter" template="sub"/>
<subproject id="statbar" template="sub"/>
<subproject id="stc" template="sub"/>
+ <subproject id="svg" template="sub"/>
+ <subproject id="taborder" template="sub"/>
<subproject id="taskbar" template="sub"/>
<subproject id="text" template="sub"/>
<subproject id="thread" template="sub"/>
@@ -84,6 +87,7 @@
<subproject id="widgets" template="sub"/>
<subproject id="wizard" template="sub"/>
<subproject id="wrapsizer" template="sub"/>
+ <subproject id="xrc" template="sub"/>
<!--
These samples don't always build (they need non-default wxWidgets
--
2.47.2