focus propagation, fixes #10047

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

diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index 64f51841f09844d6a7439b452381be1352bc261d..4493b70d0dccbd2453443cb9e6043301218e818d 100644 (file)
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -13,7 +13,6 @@ datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@

-REZ = @REZ@

 SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@
 SETFILE = @SETFILE@
 NM = @NM@
 BK_DEPS = @BK_DEPS@


@@ -31,8 +30,6 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@

-EXTRALIBS_XML = @EXTRALIBS_XML@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@

 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@


@@ -74,28 +71,20 @@ CALENDAR_OBJECTS =  \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_0@__calendar___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_0@__calendar___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = \

-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C calendar$(EXEEXT)
-@COND_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL calendar$(EXEEXT)

 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__

 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS

-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS

 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI

-@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI

 @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS

-@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS

 @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL

-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL

 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep calendar$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__calendar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd)
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep calendar$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__calendar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd)

-@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
-@COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)

 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__calendar_os2_lib_res = \
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__calendar_os2_lib_res = \


@@ -103,19 +92,19 @@ COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__calendar_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = calendar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__calendar_bundle___depname = calendar_bundle
 @COND_PLATFORM_MACOSX_1@__calendar_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = calendar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__calendar_bundle___depname = calendar_bundle

-@COND_TOOLKIT_COCOA@____calendar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   $(__calendar_app_Contents_PkgInfo___depname)

 @COND_TOOLKIT_MAC@____calendar_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__calendar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____calendar_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__calendar_app_Contents_PkgInfo___depname)

+@COND_TOOLKIT_OSX_CARBON@____calendar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__calendar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____calendar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__calendar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____calendar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__calendar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_COCOA@____calendar_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   $(__calendar_app_Contents_PkgInfo___depname)

 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)

-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)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)

 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)


@@ -142,12 +131,6 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
-       $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-       $(srcdir)/../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
-       calendar$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -169,13 +152,13 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)

-       $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
-       $(__calendar___mac_rezcmd)
+       $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       

        $(__calendar___mac_setfilecmd)
        $(__calendar___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__calendar___mac_setfilecmd)
        $(__calendar___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

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

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


@@ -184,7 +167,7 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___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/calendar/" \
 @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/calendar/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

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

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


@@ -193,7 +176,7 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

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

 
 @COND_PLATFORM_MACOSX_1@calendar_bundle: $(____calendar_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@calendar_bundle: $(____calendar_BUNDLE_TGT_REF_DEP)
 


@@ -204,6 +187,15 @@ calendar_calendar_rc.o: $(srcdir)/calendar.rc
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
 
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
 

+$(srcdir)/include/wx/stc/stc.h: \
+$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+$(srcdir)/src/stc/stc.cpp.in \
+$(srcdir)/src/stc/stc.h.in \
+$(srcdir)/src/stc/gen_iface.py
+       cd $(srcdir)/src/stc && ./gen_iface.py
+monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
+$(srcdir)/include/wx/stc/stc.h
+

 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d