fixed modal dialogs after event loop change

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

diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in
index 1b775621a0c27d434d6abaa8b4f129eb0f12c2d7..76732ee1e008ce861df0b08cabee6159ba4883de 100644 (file)
--- a/samples/richedit/Makefile.in
+++ b/samples/richedit/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -44,7 +45,7 @@ RICHEDIT_OBJECTS =  \
        richedit_wxllist.o \
        richedit_wxlparser.o \
        richedit_wxlwindow.o
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -80,7 +81,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o richedit$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -96,12 +97,15 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C richedit$(EXEEXT)
+COND_PLATFORM_OS2_1___richedit___os2_emxbindcmd = $(NM) richedit$(EXEEXT) | if \
+       grep -q pmwin.763 ; then emxbind -ep richedit$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__richedit___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___richedit___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__richedit_bundle___depname = richedit_bundle
 
 ### Targets: ###
 
-all: richedit$(EXEEXT) $(__richedit_bundle___depname)
+all: richedit$(EXEEXT) $(__richedit_bundle___depname) data
 
 clean: 
        rm -rf ./.deps ./.pch
@@ -109,6 +113,14 @@ clean:
        rm -f richedit$(EXEEXT)
        rm -rf richedit.app
 
+data: 
+       @mkdir -p .
+       @for f in wxLayout.cpp; do \
+       if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
+       cp -pRf $(srcdir)/$$f . ; \
+       fi; \
+       done
+
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
@@ -117,12 +129,13 @@ install: all
 install-strip: install
 
 richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc)
-       $(CXX) -o $@ $(RICHEDIT_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 $@ $(RICHEDIT_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)
        $(__richedit___mac_rezcmd)
        $(__richedit___mac_setfilecmd)
+       $(__richedit___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-richedit.app/Contents: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p richedit.app/Contents
        mkdir -p richedit.app/Contents/MacOS
        mkdir -p richedit.app/Contents/Resources
@@ -140,16 +153,16 @@ richedit.app/Contents: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f richedit$(EXEEXT) richedit.app/Contents/MacOS/richedit
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc richedit.app/Contents/Resources/richedit.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc richedit.app/Contents/Resources/richedit.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns richedit.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@richedit_bundle: richedit.app/Contents
+@COND_PLATFORM_MACOSX_1@richedit_bundle: richedit.app/Contents/PkgInfo
 
 richedit_kbList.o: $(srcdir)/kbList.cpp
        $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
 
 richedit_sample_rc.o: $(srcdir)/../../samples/sample.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 richedit_wxLayout.o: $(srcdir)/wxLayout.cpp
        $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
@@ -169,4 +182,4 @@ uninstall:
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install richedit_bundle uninstall
+.PHONY: all clean data distclean install richedit_bundle uninstall