diff --git a/Makefile.in b/Makefile.in index 2dc585df19..8364f90a60 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,8 +77,8 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 WX_RELEASE_NODOT = 31 -WX_VERSION = $(WX_RELEASE).0 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION = $(WX_RELEASE).1 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ $(CPPFLAGS) $(CFLAGS) @@ -6060,8 +6060,11 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS = monodll_animateg.o @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_COCOA@ monodll_src_cocoa_mediactrl.o -@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o -@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o +@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = \ +@COND_TOOLKIT_GTK@ monodll_unix_mediactrl.o monodll_mediactrl_gstplayer.o +@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = \ +@COND_TOOLKIT_MOTIF@ monodll_unix_mediactrl.o \ +@COND_TOOLKIT_MOTIF@ monodll_mediactrl_gstplayer.o @COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_MSW@ monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \ @COND_TOOLKIT_MSW@ monodll_mediactrl_qt.o @@ -6070,7 +6073,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS \ @COND_TOOLKIT_OSX_IPHONE@ = monodll_osx_cocoa_mediactrl.o @COND_TOOLKIT_QT@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_qt_mediactrl.o -@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o +@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = \ +@COND_TOOLKIT_X11@ monodll_unix_mediactrl.o monodll_mediactrl_gstplayer.o @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = \ @@ -8071,9 +8075,10 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_COCOA@ monolib_src_cocoa_mediactrl.o @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_GTK@ monolib_unix_mediactrl.o +@COND_TOOLKIT_GTK@ monolib_unix_mediactrl.o monolib_mediactrl_gstplayer.o @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_MOTIF@ monolib_unix_mediactrl.o +@COND_TOOLKIT_MOTIF@ monolib_unix_mediactrl.o \ +@COND_TOOLKIT_MOTIF@ monolib_mediactrl_gstplayer.o @COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_MSW@ monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \ @COND_TOOLKIT_MSW@ monolib_mediactrl_qt.o @@ -8082,7 +8087,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 \ @COND_TOOLKIT_OSX_IPHONE@ = monolib_osx_cocoa_mediactrl.o @COND_TOOLKIT_QT@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_qt_mediactrl.o -@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_unix_mediactrl.o +@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ +@COND_TOOLKIT_X11@ monolib_unix_mediactrl.o monolib_mediactrl_gstplayer.o @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = \ @@ -12136,9 +12142,11 @@ COND_USE_SOVERSOLARIS_1___mediadll___so_symlinks_uninst_cmd = rm -f \ @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_COCOA@ mediadll_src_cocoa_mediactrl.o @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_GTK@ mediadll_unix_mediactrl.o +@COND_TOOLKIT_GTK@ mediadll_unix_mediactrl.o \ +@COND_TOOLKIT_GTK@ mediadll_mediactrl_gstplayer.o @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_MOTIF@ mediadll_unix_mediactrl.o +@COND_TOOLKIT_MOTIF@ mediadll_unix_mediactrl.o \ +@COND_TOOLKIT_MOTIF@ mediadll_mediactrl_gstplayer.o COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 = \ mediadll_mediactrl_am.o \ mediadll_mediactrl_wmp10.o \ @@ -12150,7 +12158,8 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_OSX_IPHONE@ = mediadll_osx_cocoa_mediactrl.o @COND_TOOLKIT_QT@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_qt_mediactrl.o @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_X11@ mediadll_unix_mediactrl.o +@COND_TOOLKIT_X11@ mediadll_unix_mediactrl.o \ +@COND_TOOLKIT_X11@ mediadll_mediactrl_gstplayer.o COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@__medialib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname) @@ -12166,9 +12175,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \ @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_COCOA@ medialib_src_cocoa_mediactrl.o @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_GTK@ medialib_unix_mediactrl.o +@COND_TOOLKIT_GTK@ medialib_unix_mediactrl.o \ +@COND_TOOLKIT_GTK@ medialib_mediactrl_gstplayer.o @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_MOTIF@ medialib_unix_mediactrl.o +@COND_TOOLKIT_MOTIF@ medialib_unix_mediactrl.o \ +@COND_TOOLKIT_MOTIF@ medialib_mediactrl_gstplayer.o COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 = \ medialib_mediactrl_am.o \ medialib_mediactrl_wmp10.o \ @@ -12180,7 +12191,8 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_OSX_IPHONE@ = medialib_osx_cocoa_mediactrl.o @COND_TOOLKIT_QT@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_qt_mediactrl.o @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_X11@ medialib_unix_mediactrl.o +@COND_TOOLKIT_X11@ medialib_unix_mediactrl.o \ +@COND_TOOLKIT_X11@ medialib_mediactrl_gstplayer.o @COND_SHARED_1@____wxmedia_namedll_DEP = $(__mediadll___depname) @COND_SHARED_0@____wxmedia_namelib_DEP = $(__medialib___depname) COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \ @@ -13170,7 +13182,7 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \ @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h -@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install @COND_SHARED_0@____SHARED = @COND_SHARED_1@____SHARED = $(PIC_FLAG) @@ -13214,7 +13226,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS = \ monodll_carbon_gdiobj.o \ monodll_carbon_icon.o \ monodll_carbon_app.o \ - monodll_carbon_combobox.o \ monodll_carbon_control.o \ monodll_carbon_dataobj.o \ monodll_carbon_dcclient.o \ @@ -13359,7 +13370,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0 = \ monolib_carbon_gdiobj.o \ monolib_carbon_icon.o \ monolib_carbon_app.o \ - monolib_carbon_combobox.o \ monolib_carbon_control.o \ monolib_carbon_dataobj.o \ monolib_carbon_dcclient.o \ @@ -13504,7 +13514,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \ coredll_carbon_gdiobj.o \ coredll_carbon_icon.o \ coredll_carbon_app.o \ - coredll_carbon_combobox.o \ coredll_carbon_control.o \ coredll_carbon_dataobj.o \ coredll_carbon_dcclient.o \ @@ -13634,7 +13643,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9 = \ corelib_carbon_gdiobj.o \ corelib_carbon_icon.o \ corelib_carbon_app.o \ - corelib_carbon_combobox.o \ corelib_carbon_control.o \ corelib_carbon_dataobj.o \ corelib_carbon_dcclient.o \ @@ -13767,17 +13775,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).1.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) -@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX) +@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0 +@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ @@ -13975,7 +13983,7 @@ clean: $(__clean_wxrc___depname) rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) -(cd samples && $(MAKE) clean) - rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r + rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -14754,13 +14762,13 @@ locale_msw_uninstall: fi ; \ done -@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r: -@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r +@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).1.r: +@COND_TOOLKIT_COCOA@ $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc +@COND_TOOLKIT_COCOA@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir) -@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir) +@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir) +@COND_TOOLKIT_COCOA@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir) wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c @@ -19334,12 +19342,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp @@ -20369,6 +20371,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@monodll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp @@ -24161,12 +24172,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp @@ -25196,6 +25201,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + +@COND_TOOLKIT_X11_USE_GUI_1@monolib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp @@ -29042,12 +29056,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp @@ -32435,12 +32443,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp - -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP) -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp @@ -33977,6 +33979,15 @@ mediadll_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MEDIADLL_ODEP) @COND_TOOLKIT_X11@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp +@COND_TOOLKIT_MOTIF@mediadll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIADLL_ODEP) +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + +@COND_TOOLKIT_GTK@mediadll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIADLL_ODEP) +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + +@COND_TOOLKIT_X11@mediadll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIADLL_ODEP) +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP) $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp @@ -34010,6 +34021,15 @@ medialib_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MEDIALIB_ODEP) @COND_TOOLKIT_X11@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp +@COND_TOOLKIT_MOTIF@medialib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIALIB_ODEP) +@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + +@COND_TOOLKIT_GTK@medialib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIALIB_ODEP) +@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + +@COND_TOOLKIT_X11@medialib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIALIB_ODEP) +@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp + htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_HTML diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen index e04de2965d..e715f0b1ee 100644 --- a/build/bakefiles/Bakefiles.bkgen +++ b/build/bakefiles/Bakefiles.bkgen @@ -30,12 +30,6 @@ autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom - - - msvs2003prj,msvs2005prj,msvs2008prj - - autoconf,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 98b0d840da..9660bf0066 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2275,7 +2275,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/carbon/gdiobj.cpp src/osx/carbon/icon.cpp src/osx/carbon/app.cpp - src/osx/carbon/combobox.cpp src/osx/carbon/control.cpp src/osx/carbon/dataobj.cpp src/osx/carbon/dcclient.cpp @@ -2991,6 +2990,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/unix/mediactrl.cpp + src/unix/mediactrl_gstplayer.cpp diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl index e894e41ac5..d10595924b 100644 --- a/build/bakefiles/version.bkl +++ b/build/bakefiles/version.bkl @@ -22,7 +22,7 @@ 3. Else, i.e. if there were no changes at all to API but only internal changes, change C:R:A to C:R+1:A --> - 0 + 1 0 0 diff --git a/build/files b/build/files index 216467bc67..9ac55577b9 100644 --- a/build/files +++ b/build/files @@ -2117,7 +2117,6 @@ OSX_COMMON_SRC = src/osx/carbon/gdiobj.cpp src/osx/carbon/icon.cpp src/osx/carbon/app.cpp - src/osx/carbon/combobox.cpp src/osx/carbon/control.cpp src/osx/carbon/dataobj.cpp src/osx/carbon/dcclient.cpp @@ -2733,6 +2732,7 @@ MEDIA_COCOA_HDR = MEDIA_UNIX_SRC = src/unix/mediactrl.cpp + src/unix/mediactrl_gstplayer.cpp MEDIA_UNIX_HDR = MEDIA_GTK_SRC = diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 36bd8e1610..1d5757e4f4 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -39,7 +39,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = bcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -5561,7 +5561,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 2ceea9b67b..1d8c32c6c8 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -33,7 +33,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ WINDRES="$(WINDRES)" CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -5736,7 +5736,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 5a30f76808..71eeff2230 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -30,7 +30,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) @@ -6253,7 +6253,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/wx_base.vcxproj b/build/msw/wx_base.vcxproj index f2737d1061..3629ce8ce8 100644 --- a/build/msw/wx_base.vcxproj +++ b/build/msw/wx_base.vcxproj @@ -124,12 +124,12 @@ true $(wxBaseLibNamePrefix) $(wxBaseLibNamePrefix) - $(wxBaseLibNamePrefix)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)$(wxToolkitDllNameSuffix) $(wxBaseLibNamePrefix) $(wxBaseLibNamePrefix) - $(wxBaseLibNamePrefix)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)$(wxToolkitDllNameSuffix) diff --git a/build/msw/wx_net.vcxproj b/build/msw/wx_net.vcxproj index 644310bca4..2f6b78e984 100644 --- a/build/msw/wx_net.vcxproj +++ b/build/msw/wx_net.vcxproj @@ -126,10 +126,10 @@ $(wxBaseLibNamePrefix)_$(ProjectName) $(wxBaseLibNamePrefix)_$(ProjectName) $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) @@ -513,4 +513,4 @@ - \ No newline at end of file + diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props index 67b3d0546f..0cee81fb4b 100644 --- a/build/msw/wx_setup.props +++ b/build/msw/wx_setup.props @@ -1,6 +1,7 @@  + 311 31 msw vc @@ -62,9 +63,10 @@ $(wxToolkitPrefix)$(wxSuffix) - wx$(wxToolkitPrefix)$(wxShortVersionString)$(wxSuffix)_ + wx$(wxToolkitPrefix)$(wxVersionString)$(wxSuffix)_ _$(wxCompilerPrefix)$(wxArchSuffix)_$(wxVendor) wx$(wxToolkitPrefix)$(wxShortVersionString)$(wxSuffix)_ + wxbase$(wxVersionString)$(wxSuffix) wxbase$(wxShortVersionString)$(wxSuffix) diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index 38a4a7347d..dd991db016 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -156,7 +156,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch" ObjectFile="vc_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw310ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -166,14 +166,14 @@ @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> + + @@ -391,9 +394,6 @@ Name="Release|Win32" ExcludedFromBuild="TRUE"/> - - @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> + + @@ -1051,9 +1054,6 @@ - - + + @@ -1637,9 +1640,6 @@ - - @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ + + @@ -934,10 +938,6 @@ ExcludedFromBuild="true" /> - - @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ + + @@ -1814,10 +1818,6 @@ RelativePath="..\..\src\msw\window.cpp" > - - + + @@ -2685,10 +2689,6 @@ RelativePath="..\..\include\wx\msw\window.h" > - - @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -253,15 +253,15 @@ @@ -344,15 +344,15 @@ @@ -607,15 +607,15 @@ @@ -698,15 +698,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ + + @@ -930,10 +934,6 @@ ExcludedFromBuild="true" /> - - @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ + + @@ -1810,10 +1814,6 @@ RelativePath="..\..\src\msw\window.cpp" > - - + + @@ -2681,10 +2685,6 @@ RelativePath="..\..\include\wx\msw\window.h" > - - @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ @@ -251,15 +251,15 @@ @@ -342,15 +342,15 @@ @@ -603,15 +603,15 @@ @@ -694,15 +694,15 @@ $(wxBaseLibNamePrefix)_$(ProjectName) $(wxBaseLibNamePrefix)_$(ProjectName) $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) + $(wxBaseDllNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) @@ -494,4 +494,4 @@ - \ No newline at end of file + diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj index ef21984639..9783fbdf30 100644 --- a/build/osx/wxcocoa.xcodeproj/project.pbxproj +++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj @@ -2027,9 +2027,6 @@ BAFF04F1680F32DA988EB03D /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; BAFF04F1680F32DA988EB03E /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; BAFF04F1680F32DA988EB03F /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; - BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; - BB31D65BA1253A1CB64CE9D3 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; - BB31D65BA1253A1CB64CE9D4 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; BB6FE851028C3DE7A070C213 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; BB6FE851028C3DE7A070C214 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; BB6FE851028C3DE7A070C215 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; @@ -4272,7 +4269,6 @@ 7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtooltipcmn.cpp; path = ../../src/common/richtooltipcmn.cpp; sourceTree = ""; }; 7A24E9101688368296C21EBE /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzclose.c; path = ../../src/zlib/gzclose.c; sourceTree = ""; }; 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = ""; }; - 7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = ""; }; 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = ""; }; 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = protocol.cpp; path = ../../src/common/protocol.cpp; sourceTree = ""; }; 7BA6ADD758693BD180D3275B /* treebase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebase.cpp; path = ../../src/common/treebase.cpp; sourceTree = ""; }; @@ -5326,7 +5322,6 @@ 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */, F5DAF1F49F0F3F41A427A21D /* icon.cpp */, 757B31FCCA1F381C95B30DF8 /* app.cpp */, - 7A3F26F539473705AA82411D /* combobox.cpp */, 12363D1F50FE301DAEE7F04A /* control.cpp */, 271B4B77622B3411A7BF6634 /* dataobj.cpp */, B17772732159304AA7312D72 /* dcclient.cpp */, @@ -7527,7 +7522,6 @@ 692FCCABFB963696AFC1E124 /* gdiobj.cpp in Sources */, 01D4C5F2147F3942A7CE91AC /* icon.cpp in Sources */, B0E94A59C83637C09FAAE71E /* app.cpp in Sources */, - BB31D65BA1253A1CB64CE9D4 /* combobox.cpp in Sources */, EB52C6A91594381393294500 /* control.cpp in Sources */, 45AB45C6B24A3983B22E56A7 /* dataobj.cpp in Sources */, D088E7DDE38C31DC9C9B3419 /* dcclient.cpp in Sources */, @@ -8201,7 +8195,6 @@ 692FCCABFB963696AFC1E123 /* gdiobj.cpp in Sources */, 01D4C5F2147F3942A7CE91AB /* icon.cpp in Sources */, B0E94A59C83637C09FAAE71D /* app.cpp in Sources */, - BB31D65BA1253A1CB64CE9D3 /* combobox.cpp in Sources */, EB52C6A915943813932944FF /* control.cpp in Sources */, 45AB45C6B24A3983B22E56A6 /* dataobj.cpp in Sources */, D088E7DDE38C31DC9C9B3418 /* dcclient.cpp in Sources */, @@ -9410,7 +9403,6 @@ 692FCCABFB963696AFC1E122 /* gdiobj.cpp in Sources */, 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */, B0E94A59C83637C09FAAE71C /* app.cpp in Sources */, - BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */, EB52C6A915943813932944FE /* control.cpp in Sources */, 45AB45C6B24A3983B22E56A5 /* dataobj.cpp in Sources */, D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */, diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj index 4046c2ab1e..f175d3774a 100644 --- a/build/osx/wxiphone.xcodeproj/project.pbxproj +++ b/build/osx/wxiphone.xcodeproj/project.pbxproj @@ -605,7 +605,6 @@ BAA75384DA82370298672333 /* helpctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42E433D1700631A8907B8227 /* helpctrl.cpp */; }; BAAB6B1D80A33843A8436B10 /* appunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */; }; BAFF04F1680F32DA988EB03D /* stockitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B180290089B139F18B0C7BBA /* stockitem.cpp */; }; - BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A3F26F539473705AA82411D /* combobox.cpp */; }; BB6FE851028C3DE7A070C213 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 20B922D61CDB3CCEB59A5194 /* convauto.cpp */; }; BBAABF3C693E37D3B0FF2502 /* colrdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66AC0EA493AB3B6A86DAE174 /* colrdlgg.cpp */; }; BCD81FD3D1EC305F801E1C1B /* sckipc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */; }; @@ -1246,7 +1245,6 @@ 7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = richtooltipcmn.cpp; path = ../../src/common/richtooltipcmn.cpp; sourceTree = ""; }; 7A24E9101688368296C21EBE /* gzclose.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = gzclose.c; path = ../../src/zlib/gzclose.c; sourceTree = ""; }; 7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = ""; }; - 7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = ""; }; 7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = ""; }; 7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = protocol.cpp; path = ../../src/common/protocol.cpp; sourceTree = ""; }; 7BA6ADD758693BD180D3275B /* treebase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebase.cpp; path = ../../src/common/treebase.cpp; sourceTree = ""; }; @@ -1972,7 +1970,6 @@ 377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */, F5DAF1F49F0F3F41A427A21D /* icon.cpp */, 757B31FCCA1F381C95B30DF8 /* app.cpp */, - 7A3F26F539473705AA82411D /* combobox.cpp */, 12363D1F50FE301DAEE7F04A /* control.cpp */, 271B4B77622B3411A7BF6634 /* dataobj.cpp */, B17772732159304AA7312D72 /* dcclient.cpp */, @@ -3023,7 +3020,6 @@ 692FCCABFB963696AFC1E122 /* gdiobj.cpp in Sources */, 01D4C5F2147F3942A7CE91AA /* icon.cpp in Sources */, B0E94A59C83637C09FAAE71C /* app.cpp in Sources */, - BB31D65BA1253A1CB64CE9D2 /* combobox.cpp in Sources */, EB52C6A915943813932944FE /* control.cpp in Sources */, 45AB45C6B24A3983B22E56A5 /* dataobj.cpp in Sources */, D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */, diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig index 1033a57fc7..e4fe5bf103 100644 --- a/build/osx/wxvers.xcconfig +++ b/build/osx/wxvers.xcconfig @@ -1,4 +1,4 @@ // update this file with new version numbers DYLIB_COMPATIBILITY_VERSION = 3.1 -DYLIB_CURRENT_VERSION = 3.1.0 +DYLIB_CURRENT_VERSION = 3.1.1 diff --git a/configure b/configure index 49e5978fa5..ae980109fa 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.0. +# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='3.1.0' -PACKAGE_STRING='wxWidgets 3.1.0' +PACKAGE_VERSION='3.1.1' +PACKAGE_STRING='wxWidgets 3.1.1' PACKAGE_BUGREPORT='wx-dev@googlegroups.com' PACKAGE_URL='' @@ -715,7 +715,6 @@ COND_TOOLKIT_OSX_COCOA_WXUNIV_0 COND_TOOLKIT_OSX_COCOA_USE_GUI_1 COND_TOOLKIT_OSX_COCOA COND_TOOLKIT_OSX_CARBON -COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW @@ -1946,7 +1945,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 3.1.0 to adapt to many kinds of systems. +\`configure' configures wxWidgets 3.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2015,7 +2014,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 3.1.0:";; + short | recursive ) echo "Configuration of wxWidgets 3.1.1:";; esac cat <<\_ACEOF @@ -2469,7 +2468,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 3.1.0 +wxWidgets configure 3.1.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3195,7 +3194,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 3.1.0, which was +It was created by wxWidgets $as_me 3.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3658,7 +3657,7 @@ fi wx_major_version_number=3 wx_minor_version_number=1 -wx_release_number=0 +wx_release_number=1 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -35906,6 +35905,89 @@ pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 $as_echo_n "checking for GST... " >&6; } +if test -n "$PKG_CONFIG"; then + if test -n "$GST_CFLAGS"; then + pkg_cv_GST_CFLAGS="$GST_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION gstreamer-player-\$GST_VERSION >= 1.7.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GST_LIBS"; then + pkg_cv_GST_LIBS="$GST_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-video-\$GST_VERSION gstreamer-player-\$GST_VERSION >= 1.7.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1"` + else + GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GST_PKG_ERRORS" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&5 +$as_echo "$as_me: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&6;} + + +elif test $pkg_failed = untried; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&5 +$as_echo "$as_me: GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0" >&6;} + + +else + GST_CFLAGS=$pkg_cv_GST_CFLAGS + GST_LIBS=$pkg_cv_GST_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + wxUSE_GSTREAMER="yes" + $as_echo "#define wxUSE_GSTREAMER_PLAYER 1" >>confdefs.h + + +fi + + if test $wxUSE_GSTREAMER = "no"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 +$as_echo_n "checking for GST... " >&6; } + if test -n "$PKG_CONFIG"; then if test -n "$GST_CFLAGS"; then pkg_cv_GST_CFLAGS="$GST_CFLAGS" @@ -35961,20 +36043,20 @@ fi echo "$GST_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 $as_echo "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&2;} - GST_VERSION_MAJOR=0 - GST_VERSION_MINOR=10 - GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR + GST_VERSION_MAJOR=0 + GST_VERSION_MINOR=10 + GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&5 $as_echo "$as_me: WARNING: GStreamer 1.0 not available, falling back to 0.10" >&2;} - GST_VERSION_MAJOR=0 - GST_VERSION_MINOR=10 - GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR + GST_VERSION_MAJOR=0 + GST_VERSION_MINOR=10 + GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR else @@ -35983,9 +36065,10 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - wxUSE_GSTREAMER="yes" + wxUSE_GSTREAMER="yes" fi + fi if test $GST_VERSION_MINOR = "10"; then @@ -38824,11 +38907,6 @@ EOF COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_MSW_WXUNIV_0="#" - if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_MSW_WXUNIV_0="" - fi - COND_TOOLKIT_OSX_CARBON="#" if test "x$TOOLKIT" = "xOSX_CARBON" ; then COND_TOOLKIT_OSX_CARBON="" @@ -40109,7 +40187,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 3.1.0, which was +This file was extended by wxWidgets $as_me 3.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -40175,7 +40253,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxWidgets config.status 3.1.0 +wxWidgets config.status 3.1.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 3971754689..41d34cdcc2 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [3.1.0], [wx-dev@googlegroups.com]) +AC_INIT([wxWidgets], [3.1.1], [wx-dev@googlegroups.com]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -40,7 +40,7 @@ dnl wx_release_number += 1 wx_major_version_number=3 wx_minor_version_number=1 -wx_release_number=0 +wx_release_number=1 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -7260,18 +7260,31 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR PKG_CHECK_MODULES(GST, - [gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION], + [gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION gstreamer-player-$GST_VERSION >= 1.7.2.1], [ wxUSE_GSTREAMER="yes" + AC_DEFINE(wxUSE_GSTREAMER_PLAYER) ], [ - AC_MSG_WARN([GStreamer 1.0 not available, falling back to 0.10]) - GST_VERSION_MAJOR=0 - GST_VERSION_MINOR=10 - GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR + AC_MSG_NOTICE([GStreamer 1.7.2+ not available. Not using GstPlayer and falling back to 1.0]) ] ) + if test $wxUSE_GSTREAMER = "no"; then + PKG_CHECK_MODULES(GST, + [gstreamer-$GST_VERSION gstreamer-video-$GST_VERSION], + [ + wxUSE_GSTREAMER="yes" + ], + [ + AC_MSG_WARN([GStreamer 1.0 not available, falling back to 0.10]) + GST_VERSION_MAJOR=0 + GST_VERSION_MINOR=10 + GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR + ] + ) + fi + if test $GST_VERSION_MINOR = "10"; then PKG_CHECK_MODULES(GST, [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION], diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 4d4bc80fae..2b55213594 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 0a965941e4..a5271a3991 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 617b8f55a8..9e233139d5 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index ca4431ef01..cf4b717205 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 93688ed6d1..318db8b408 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/docs/changes.txt b/docs/changes.txt index 56733f93a9..4ab6f1dd5c 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -34,6 +34,10 @@ Changes in behaviour not resulting in compilation errors - wxOSX/Carbon port doesn't exist any more, wxOSX/Cocoa will be silently used instead even if configure --with-osx_carbon option is used. +- The pure virtual function wxAppTrait::GetToolkitVersion() now has a parameter + for getting the micro version. If you override GetToolkitVersion() you need + to add this new third parameter. + Changes in behaviour which may result in build errors ----------------------------------------------------- @@ -51,14 +55,29 @@ Changes in behaviour which may result in build errors 3.1.1: (not released yet) ---------------------------- +All: + +- Add support for the micro version (third component) to OS and toolkit version + functions. See wxGetOsVersion(), wxPlatformInfo, and wxAppTraits. +- wxLogInfo() now logs messages if the log level is high enough, even without + wxLog::SetVerbose() which now only affects wxLogVerbose(). +- Add wxFileType::GetExpandedCommand() (troelsk). + wxMSW: - Fix crash when using wxCHMHelpController() in 64 bit builds (Xlord2). +- Fix MDI menu display after failure to create a child frame (troelsk). wxOSX: +- Remove extra borders around wxFilePickerCtrl (John Roberts). +- Set up extensions filter correctly in wxFileDialog (nick863). - Turn off automatic quotes substitutions in wxTextCtrl (Xlord2). +Unix: + +- Support new gstreamer API in 1.7.2+ in wxMediaCtrl (Sebastian Dröge). + 3.1.0: (released 2016-02-29) ---------------------------- diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index 84d6ea57ad..a5dd625c2f 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -6,7 +6,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets -PROJECT_NUMBER = 3.1.0 +PROJECT_NUMBER = 3.1.1 PROJECT_BRIEF = PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = out diff --git a/docs/index.htm b/docs/index.htm index 1ba22ee05d..880723d2f0 100644 --- a/docs/index.htm +++ b/docs/index.htm @@ -1,6 +1,5 @@ - - - + +