Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / samples / svg / Makefile.in

diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index 6c67dbc9a960fb096824727c5834085ab01074ee..63c90501d30911bad7f3173ce1af6732c6eb5afe 100644 (file)
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

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

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


@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
 
 DESTDIR = 
 WX_RELEASE = 2.9

-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2

 LIBDIRNAME = $(wx_top_builddir)/lib
 SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 LIBDIRNAME = $(wx_top_builddir)/lib
 SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \


@@ -175,7 +175,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
 @COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP)
 
 svgtest_sample_rc.o: $(srcdir)/../../samples/sample.rc
 @COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP)
 
 svgtest_sample_rc.o: $(srcdir)/../../samples/sample.rc

-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include

 
 svgtest_svgtest.o: $(srcdir)/svgtest.cpp
        $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $(srcdir)/svgtest.cpp
 
 svgtest_svgtest.o: $(srcdir)/svgtest.cpp
        $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $(srcdir)/svgtest.cpp