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

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

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 2ec196b0a4fa2a63b7ec02d9c850446c9abfba5a..30b09306ace086d81b15cf3c59ba66057d138ec1 100644 (file)
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/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!
 # =========================================================================
 


@@ -30,6 +30,7 @@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@

+EXTRALIBS_GNOMEPRINT = @EXTRALIBS_GNOMEPRINT@

 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@


@@ -38,7 +39,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
 WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 LIBDIRNAME = $(top_builddir)lib
 WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)


@@ -51,7 +52,8 @@ WIZARD_OBJECTS =  \
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
+@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = \
+@COND_USE_PLUGINS_0@   $(EXTRALIBS_SDL) $(EXTRALIBS_GNOMEPRINT)

 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon


@@ -116,7 +118,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 wizard$(EXEEXT) Carbon.r \
 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 wizard$(EXEEXT) Carbon.r \

-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.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: ###


@@ -136,7 +138,7 @@ clean:
        rm -rf wizard.app
 
 distclean: clean
        rm -rf wizard.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

 
 wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
        $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
 
 wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
        $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)


@@ -145,7 +147,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
        $(__wizard___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__wizard___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

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

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


@@ -163,16 +165,16 @@ wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
        ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard
        
        
        ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard
        
        

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

        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP)
 
 wizard_wizard.o: $(srcdir)/wizard.cpp
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP)
 
 wizard_wizard.o: $(srcdir)/wizard.cpp

-       $(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $(srcdir)/wizard.cpp

 
 wizard_wizard_rc.o: $(srcdir)/wizard.rc
 
 wizard_wizard_rc.o: $(srcdir)/wizard.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: