Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / samples / makefile.bcc

diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index 683b036b17f3be7d45f72fc1571881dd0f266a0c..1fff0974bc580ca34d99130b02c1f537b5f6de52 100644 (file)
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\r
 #     This makefile was generated by\r

-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

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


@@ -33,11 +33,10 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \\r
        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \\r
        -DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \\r
        -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \\r
        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \\r
        -DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \\r

-       -DUSE_GDIPLUS="$(USE_GDIPLUS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \\r
-       -DVENDOR="$(VENDOR)" -DWX_FLAVOUR="$(WX_FLAVOUR)" \\r
-       -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" -DCFG="$(CFG)" \\r
-       -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
-       -DRUNTIME_LIBS="$(RUNTIME_LIBS)"\r
+       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \\r
+       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \\r
+       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \\r
+       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"\r

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -45,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 \r
 ### Targets: ###\r
 \r
 \r
 ### Targets: ###\r
 \r

-all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll 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 ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc\r
+all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll 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 ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll widgets wizard wrapsizer xrc\r

 \r
 clean: \r
        -if exist .\*.obj del .\*.obj\r
 \r
 clean: \r
        -if exist .\*.obj del .\*.obj\r


@@ -335,6 +334,10 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>typetest.bat\r
        call typetest.bat\r
        @del typetest.bat\r
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>typetest.bat\r
        call typetest.bat\r
        @del typetest.bat\r

+       @echo cd uiaction >uiaction.bat\r
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>uiaction.bat\r
+       call uiaction.bat\r
+       @del uiaction.bat\r

        @echo cd validate >validate.bat\r
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>validate.bat\r
        call validate.bat\r
        @echo cd validate >validate.bat\r
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>validate.bat\r
        call validate.bat\r


@@ -790,6 +793,12 @@ typetest:
        call typetest.bat\r
        @del typetest.bat\r
 \r
        call typetest.bat\r
        @del typetest.bat\r
 \r

+uiaction: \r
+       @echo cd uiaction >uiaction.bat\r
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>uiaction.bat\r
+       call uiaction.bat\r
+       @del uiaction.bat\r
+\r

 validate: \r
        @echo cd validate >validate.bat\r
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>validate.bat\r
 validate: \r
        @echo cd validate >validate.bat\r
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>validate.bat\r