use parent background and not ours unless one was explicitly set when manually drawin...

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

diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in
index bedfe10d8ebe4d57f768346acc465e1ba63906c6..b2102159bcce017e156a9cf98a87eab47802c9c5 100644 (file)
--- a/samples/wrapsizer/Makefile.in
+++ b/samples/wrapsizer/Makefile.in
@@ -162,7 +162,7 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
        $(__wrapsizer___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__wrapsizer___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents/Resources


@@ -171,7 +171,7 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
 @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/wrapsizer/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @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/wrapsizer/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >wrapsizer.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >wrapsizer.app/Contents/PkgInfo


@@ -180,7 +180,7 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f wrapsizer$(EXEEXT) wrapsizer.app/Contents/MacOS/wrapsizer
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f wrapsizer$(EXEEXT) wrapsizer.app/Contents/MacOS/wrapsizer
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@wrapsizer_bundle: $(____wrapsizer_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@wrapsizer_bundle: $(____wrapsizer_BUNDLE_TGT_REF_DEP)