allow using SetFont(wxNullFont) to reset the font as per documented behaviour (#3238)

[wxWidgets.git] / samples / html / about / Makefile.in

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 86e85d5825ccaa6a12d0a7d5a57a2d39340f6b6b..8e8cd0718179ef28ae4fa25659d6c556545f8480 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -97,10 +97,13 @@ COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__about_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__about_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = about.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__about_bundle___depname = about_bundle
 @COND_TOOLKIT_COCOA@____about_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   about.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____about_BUNDLE_TGT_REF_DEP = about.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__about_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____about_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     $(__about_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -163,25 +166,25 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
        $(__about___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p about.app/Contents
-       mkdir -p about.app/Contents/MacOS
-       mkdir -p about.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/about/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >about.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >about.app/Contents/PkgInfo
-       
-       
-       ln -f about$(EXEEXT) about.app/Contents/MacOS/about
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/about/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >about.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >about.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f about$(EXEEXT) about.app/Contents/MacOS/about
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@about_bundle: $(____about_BUNDLE_TGT_REF_DEP)