fix sizing of extra control

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 302bb6cec18871b3873e649efa50de09e5fc6c0e..bf07c8b5a6ea14e986de1e3fe8f9b7d528302b38 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -12,14 +12,16 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \

        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \

-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \

        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \


@@ -33,7 +35,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc

 
 clean: 
        -if exist .\*.o del .\*.o
 
 clean: 
        -if exist .\*.o del .\*.o


@@ -44,14 +46,12 @@ clean:
        $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C checklst -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 console -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dataview -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 console -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C db -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean


@@ -60,7 +60,6 @@ clean:
        $(MAKE) -C docvwmdi -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C docvwmdi -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C dynamic -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 erase -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C event -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean


@@ -76,29 +75,23 @@ clean:
        $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C listbox -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C minifram -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C multimon -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C png -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C propsize -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean

-       $(MAKE) -C rotate -f makefile.gcc $(MAKEARGS) clean

        $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C scrollsub -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C scrollsub -f makefile.gcc $(MAKEARGS) clean


@@ -119,6 +112,7 @@ clean:
        $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) 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 mfc -f makefile.gcc $(MAKEARGS) clean
 
 access: 
        $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
 
 access: 


@@ -139,9 +133,6 @@ calendar:
 caret: 
        $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all
 
 caret: 
        $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all
 

-checklst: 
-       $(MAKE) -C checklst -f makefile.gcc $(MAKEARGS) all
-

 collpane: 
        $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all
 
 collpane: 
        $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all
 


@@ -160,9 +151,6 @@ controls:
 dataview: 
        $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) all
 
 dataview: 
        $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) all
 

-db: 
-       $(MAKE) -C db -f makefile.gcc $(MAKEARGS) all
-

 dialogs: 
        $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) all
 
 dialogs: 
        $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) all
 


@@ -187,9 +175,6 @@ dragimag:
 drawing: 
        $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) all
 
 drawing: 
        $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) all
 

-dynamic: 
-       $(MAKE) -C dynamic -f makefile.gcc $(MAKEARGS) all
-

 erase: 
        $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) all
 
 erase: 
        $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) all
 


@@ -235,9 +220,6 @@ keyboard:
 layout: 
        $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) all
 
 layout: 
        $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) all
 

-listbox: 
-       $(MAKE) -C listbox -f makefile.gcc $(MAKEARGS) all
-

 listctrl: 
        $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) all
 
 listctrl: 
        $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) all
 


@@ -253,18 +235,12 @@ memcheck:
 menu: 
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all
 
 menu: 
        $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all
 

-minifram: 
-       $(MAKE) -C minifram -f makefile.gcc $(MAKEARGS) all
-

 minimal: 
        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all
 
 mobile: 
        $(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) all
 
 minimal: 
        $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all
 
 mobile: 
        $(MAKE) -C mobile -f makefile.gcc $(MAKEARGS) all
 

-multimon: 
-       $(MAKE) -C multimon -f makefile.gcc $(MAKEARGS) all
-

 nativdlg: 
        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all
 
 nativdlg: 
        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all
 


@@ -280,18 +256,12 @@ opengl:
 ownerdrw: 
        $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) all
 
 ownerdrw: 
        $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) all
 

-png: 
-       $(MAKE) -C png -f makefile.gcc $(MAKEARGS) all
-

 popup: 
        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all
 
 printing: 
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
 
 popup: 
        $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all
 
 printing: 
        $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
 

-propsize: 
-       $(MAKE) -C propsize -f makefile.gcc $(MAKEARGS) all
-

 regtest: 
        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all
 
 regtest: 
        $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all
 


@@ -301,9 +271,6 @@ render:
 richtext: 
        $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all
 
 richtext: 
        $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all
 

-rotate: 
-       $(MAKE) -C rotate -f makefile.gcc $(MAKEARGS) all
-

 sashtest: 
        $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all
 
 sashtest: 
        $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all
 


@@ -364,11 +331,16 @@ widgets:
 wizard: 
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all
 
 wizard: 
        $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all
 

+wrapsizer: 
+       $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
+

 mfc: 
        $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
 
 mfc: 
        $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
 

-.PHONY: all clean access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc
+

 
 

+SHELL := $(COMSPEC)

 
 # Dependencies tracking:
 -include ./*.d
 
 # Dependencies tracking:
 -include ./*.d