use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

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

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index c0090f47fafef196892047119808d3dfd2c9f5a8..3d4639efd5732f97e7be195be0bc6a4faac28089 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)

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


@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.5
 
 DESTDIR = 
 WX_RELEASE = 2.5

-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4

 LIBDIRNAME = $(top_builddir)lib
 CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 LIBDIRNAME = $(top_builddir)lib
 CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)


@@ -57,6 +57,10 @@ CONFTEST_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ

+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 

 @COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C conftest$(EXEEXT)
 @COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C conftest$(EXEEXT)
 @COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)


@@ -107,7 +111,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o conftest$(EXEEXT) \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o conftest$(EXEEXT) \

-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
+       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -127,16 +131,16 @@ clean:
        rm -rf conftest.app
 
 distclean: clean
        rm -rf conftest.app
 
 distclean: clean

-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile

 
 conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
 
 conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)

-       $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)

        $(__conftest___mac_rezcmd)
        $(__conftest___mac_setfilecmd)
        $(__conftest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__conftest___mac_rezcmd)
        $(__conftest___mac_setfilecmd)
        $(__conftest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p conftest.app/Contents
        mkdir -p conftest.app/Contents/MacOS
        mkdir -p conftest.app/Contents/Resources
        mkdir -p conftest.app/Contents
        mkdir -p conftest.app/Contents/MacOS
        mkdir -p conftest.app/Contents/Resources


@@ -154,16 +158,16 @@ conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
        ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest
        
        
        ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest
        
        

-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc conftest.app/Contents/Resources/conftest.rsrc
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc conftest.app/Contents/Resources/conftest.rsrc

        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP)
 
 conftest_conftest.o: $(srcdir)/conftest.cpp
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP)
 
 conftest_conftest.o: $(srcdir)/conftest.cpp

-       $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $(srcdir)/conftest.cpp

 
 conftest_conftest_rc.o: $(srcdir)/conftest.rc
 
 conftest_conftest_rc.o: $(srcdir)/conftest.rc

-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include

 
 
 # Include dependency info, if present:
 
 
 # Include dependency info, if present: