diff --git a/Makefile.in b/Makefile.in index cee07db1498d..4befb9aa88b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2266,10 +2266,6 @@ COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR = \ wx/msw/joystick.h \ wx/msw/taskbar.h @COND_PLATFORM_WIN32_1@GTK_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@UNIV_PLATFORM_HDR \ -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = wx/generic/animate.h -@COND_TOOLKIT_MSW@UNIV_PLATFORM_HDR = wx/generic/animate.h -@COND_TOOLKIT_X11@UNIV_PLATFORM_HDR = wx/generic/animate.h @COND_TOOLKIT_MSW@MSW_HTML_HDR = wx/msw/helpbest.h @COND_PLATFORM_MACOSX_1@WEBVIEW_HDR_PLATFORM = \ @COND_PLATFORM_MACOSX_1@ wx/osx/webviewhistoryitem_webkit.h \ @@ -2654,7 +2650,6 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ wx/msw/fswatcher.h @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR) COND_TOOLKIT_DFB_LOWLEVEL_HDR = \ - wx/generic/animate.h \ wx/generic/caret.h \ wx/generic/colour.h \ wx/generic/icon.h \ @@ -2916,7 +2911,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR = \ wx/gtk1/textctrl.h \ wx/gtk1/tglbtn.h \ wx/gtk1/treectrl.h \ - wx/generic/animate.h \ wx/generic/activityindicator.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR = \ @@ -3177,9 +3171,7 @@ COND_TOOLKIT_MOTIF_GUI_HDR = \ wx/motif/tglbtn.h \ wx/motif/toolbar.h \ wx/motif/toplevel.h \ - wx/motif/window.h \ - wx/generic/animate.h \ - wx/generic/animateanimate.h + wx/motif/window.h @COND_TOOLKIT_MOTIF@GUI_HDR = $(COND_TOOLKIT_MOTIF_GUI_HDR) COND_TOOLKIT_MSW_GUI_HDR = \ wx/generic/clrpickerg.h \ @@ -3280,7 +3272,6 @@ COND_TOOLKIT_MSW_GUI_HDR = \ wx/msw/rt/utils.h \ wx/msw/hyperlink.h \ wx/msw/bmpcbox.h \ - wx/generic/animate.h \ wx/msw/commandlinkbutton.h \ wx/msw/datetimectrl.h \ wx/msw/timectrl.h \ @@ -3417,7 +3408,6 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \ wx/generic/region.h \ wx/osx/cocoa/stdpaths.h \ wx/osx/sound.h \ - wx/generic/animate.h \ wx/osx/dvrenderer.h \ wx/osx/cocoa/dataview.h \ wx/osx/dvrenderers.h \ @@ -3524,7 +3514,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \ wx/osx/iphone/evtloop.h \ wx/osx/iphone/private.h \ wx/generic/region.h \ - wx/generic/animate.h \ wx/osx/sound.h @COND_TOOLKIT_OSX_IPHONE@GUI_HDR = $(COND_TOOLKIT_OSX_IPHONE_GUI_HDR) COND_TOOLKIT_QT_GUI_HDR = \ @@ -3607,7 +3596,6 @@ COND_TOOLKIT_QT_GUI_HDR = \ wx/generic/fontpickerg.h \ wx/generic/caret.h \ wx/qt/calctrl.h \ - wx/generic/animate.h \ wx/qt/dvrenderer.h \ wx/qt/taskbar.h \ wx/generic/activityindicator.h \ @@ -3626,9 +3614,7 @@ COND_TOOLKIT_QT_GUI_HDR = \ @COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR) COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \ - $(UNIV_PLATFORM_HDR) \ wx/generic/accel.h \ - wx/generic/animate.h \ wx/generic/clrpickerg.h \ wx/generic/collpaneg.h \ wx/generic/ctrlsub.h \ @@ -3723,6 +3709,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/gbsizer.h \ wx/gdicmn.h \ wx/generic/accel.h \ + wx/generic/animate.h \ wx/generic/buttonbar.h \ wx/generic/choicdgg.h \ wx/generic/combo.h \ @@ -4552,6 +4539,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_windowid.o \ monodll_wrapsizer.o \ monodll_xpmdecod.o \ + monodll_animateg.o \ monodll_busyinfo.o \ monodll_generic_buttonbar.o \ monodll_choicdgg.o \ @@ -4629,7 +4617,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ $(__LOWLEVEL_SRC_OBJECTS_1) \ $(__PLATFORM_SRC_OBJECTS) \ - $(__UNIV_PLATFORM_SRC_OBJECTS) \ monodll_generic_accel.o \ monodll_clrpickerg.o \ monodll_collpaneg.o \ @@ -4813,6 +4800,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_windowid.o \ monodll_wrapsizer.o \ monodll_xpmdecod.o \ + monodll_animateg.o \ monodll_busyinfo.o \ monodll_generic_buttonbar.o \ monodll_choicdgg.o \ @@ -4889,7 +4877,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \ monodll_fontmgrcmn.o \ - monodll_animateg.o \ monodll_generic_caret.o \ monodll_generic_colour.o \ monodll_generic_icon.o \ @@ -5262,8 +5249,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \ monodll_gtk1_tglbtn.o \ monodll_gtk1_taskbar.o \ monodll_generic_activityindicator.o \ - monodll_gtk1_eggtrayicon.o \ - monodll_animateg.o + monodll_gtk1_eggtrayicon.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_generic_accel.o \ @@ -5528,7 +5514,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_generic_statline.o \ monodll_generic_statusbr.o \ monodll_tabg.o \ - monodll_animateg.o \ monodll_generic_activityindicator.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ @@ -5590,7 +5575,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \ monodll_msw_treectrl.o \ monodll_systhemectrl.o \ monodll_customdraw.o \ - monodll_animateg.o \ monodll_commandlinkbutton.o \ monodll_msw_bmpcbox.o \ monodll_msw_hyperlink.o \ @@ -5644,7 +5628,6 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS = \ monodll_cocoa_settings.o \ monodll_cocoa_overlay.o \ monodll_cocoa_aboutdlg.o \ - monodll_animateg.o \ monodll_dataview_osx.o \ monodll_cocoa_notifmsg.o \ monodll_cocoa_taskbar.o \ @@ -5683,7 +5666,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS = \ monodll_iphone_settings.o \ monodll_sound_osx.o \ monodll_core_sound.o \ - monodll_animateg.o \ monodll_iphone_statbmp.o @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS) COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \ @@ -5698,7 +5680,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \ monodll_generic_imaglist.o \ monodll_prntdlgg.o \ monodll_generic_textmeasure.o \ - monodll_animateg.o \ monodll_generic_activityindicator.o \ monodll_qt_accel.o \ monodll_qt_app.o \ @@ -5798,7 +5779,6 @@ COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS = \ @COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontmgrcmn.o \ - monodll_animateg.o \ monodll_generic_caret.o \ monodll_generic_colour.o \ monodll_generic_icon.o \ @@ -6124,10 +6104,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_x11_window.o \ monodll_displayx11.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__UNIV_PLATFORM_SRC_OBJECTS \ -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_animateg.o -@COND_TOOLKIT_MSW@__UNIV_PLATFORM_SRC_OBJECTS = monodll_animateg.o -@COND_TOOLKIT_X11@__UNIV_PLATFORM_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 = \ @@ -6543,6 +6519,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_windowid.o \ monolib_wrapsizer.o \ monolib_xpmdecod.o \ + monolib_animateg.o \ monolib_busyinfo.o \ monolib_generic_buttonbar.o \ monolib_choicdgg.o \ @@ -6620,7 +6597,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ $(__LOWLEVEL_SRC_OBJECTS_3) \ $(__PLATFORM_SRC_OBJECTS_0) \ - $(__UNIV_PLATFORM_SRC_OBJECTS_1) \ monolib_generic_accel.o \ monolib_clrpickerg.o \ monolib_collpaneg.o \ @@ -6804,6 +6780,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_windowid.o \ monolib_wrapsizer.o \ monolib_xpmdecod.o \ + monolib_animateg.o \ monolib_busyinfo.o \ monolib_generic_buttonbar.o \ monolib_choicdgg.o \ @@ -6880,7 +6857,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_fontmgrcmn.o \ - monolib_animateg.o \ monolib_generic_caret.o \ monolib_generic_colour.o \ monolib_generic_icon.o \ @@ -7253,8 +7229,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \ monolib_gtk1_tglbtn.o \ monolib_gtk1_taskbar.o \ monolib_generic_activityindicator.o \ - monolib_gtk1_eggtrayicon.o \ - monolib_animateg.o + monolib_gtk1_eggtrayicon.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_generic_accel.o \ @@ -7519,7 +7494,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_generic_statline.o \ monolib_generic_statusbr.o \ monolib_tabg.o \ - monolib_animateg.o \ monolib_generic_activityindicator.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ @@ -7581,7 +7555,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \ monolib_msw_treectrl.o \ monolib_systhemectrl.o \ monolib_customdraw.o \ - monolib_animateg.o \ monolib_commandlinkbutton.o \ monolib_msw_bmpcbox.o \ monolib_msw_hyperlink.o \ @@ -7635,7 +7608,6 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_cocoa_settings.o \ monolib_cocoa_overlay.o \ monolib_cocoa_aboutdlg.o \ - monolib_animateg.o \ monolib_dataview_osx.o \ monolib_cocoa_notifmsg.o \ monolib_cocoa_taskbar.o \ @@ -7674,7 +7646,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 = \ monolib_iphone_settings.o \ monolib_sound_osx.o \ monolib_core_sound.o \ - monolib_animateg.o \ monolib_iphone_statbmp.o @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1) COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \ @@ -7689,7 +7660,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \ monolib_generic_imaglist.o \ monolib_prntdlgg.o \ monolib_generic_textmeasure.o \ - monolib_animateg.o \ monolib_generic_activityindicator.o \ monolib_qt_accel.o \ monolib_qt_app.o \ @@ -7789,7 +7759,6 @@ COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_1 = \ @COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_1) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontmgrcmn.o \ - monolib_animateg.o \ monolib_generic_caret.o \ monolib_generic_colour.o \ monolib_generic_icon.o \ @@ -8115,10 +8084,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_x11_window.o \ monolib_displayx11.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__UNIV_PLATFORM_SRC_OBJECTS_1 \ -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_animateg.o -@COND_TOOLKIT_MSW@__UNIV_PLATFORM_SRC_OBJECTS_1 = monolib_animateg.o -@COND_TOOLKIT_X11@__UNIV_PLATFORM_SRC_OBJECTS_1 = monolib_animateg.o @COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_COCOA@ monolib_src_cocoa_mediactrl.o @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \ @@ -8679,6 +8644,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_windowid.o \ coredll_wrapsizer.o \ coredll_xpmdecod.o \ + coredll_animateg.o \ coredll_busyinfo.o \ coredll_buttonbar.o \ coredll_choicdgg.o \ @@ -8756,7 +8722,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ $(__LOWLEVEL_SRC_OBJECTS_5) \ $(__PLATFORM_SRC_OBJECTS_8) \ - $(__UNIV_PLATFORM_SRC_OBJECTS_2) \ coredll_generic_accel.o \ coredll_clrpickerg.o \ coredll_collpaneg.o \ @@ -8940,6 +8905,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_windowid.o \ coredll_wrapsizer.o \ coredll_xpmdecod.o \ + coredll_animateg.o \ coredll_busyinfo.o \ coredll_buttonbar.o \ coredll_choicdgg.o \ @@ -9016,7 +8982,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_fontmgrcmn.o \ - coredll_animateg.o \ coredll_generic_caret.o \ coredll_generic_colour.o \ coredll_generic_icon.o \ @@ -9389,8 +9354,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \ coredll_gtk1_tglbtn.o \ coredll_gtk1_taskbar.o \ coredll_generic_activityindicator.o \ - coredll_gtk1_eggtrayicon.o \ - coredll_animateg.o + coredll_gtk1_eggtrayicon.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_generic_accel.o \ @@ -9655,7 +9619,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_generic_statline.o \ coredll_generic_statusbr.o \ coredll_tabg.o \ - coredll_animateg.o \ coredll_generic_activityindicator.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ @@ -9717,7 +9680,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \ coredll_msw_treectrl.o \ coredll_systhemectrl.o \ coredll_customdraw.o \ - coredll_animateg.o \ coredll_commandlinkbutton.o \ coredll_msw_bmpcbox.o \ coredll_msw_hyperlink.o \ @@ -9771,7 +9733,6 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_cocoa_settings.o \ coredll_cocoa_overlay.o \ coredll_cocoa_aboutdlg.o \ - coredll_animateg.o \ coredll_dataview_osx.o \ coredll_cocoa_notifmsg.o \ coredll_cocoa_taskbar.o \ @@ -9810,7 +9771,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 = \ coredll_iphone_settings.o \ coredll_sound_osx.o \ coredll_core_sound.o \ - coredll_animateg.o \ coredll_iphone_statbmp.o @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2) COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \ @@ -9825,7 +9785,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \ coredll_generic_imaglist.o \ coredll_prntdlgg.o \ coredll_generic_textmeasure.o \ - coredll_animateg.o \ coredll_generic_activityindicator.o \ coredll_qt_accel.o \ coredll_qt_app.o \ @@ -9925,7 +9884,6 @@ COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_2 = \ @COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_2) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontmgrcmn.o \ - coredll_animateg.o \ coredll_generic_caret.o \ coredll_generic_colour.o \ coredll_generic_icon.o \ @@ -10251,10 +10209,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_x11_window.o \ coredll_displayx11.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__UNIV_PLATFORM_SRC_OBJECTS_2 \ -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = coredll_animateg.o -@COND_TOOLKIT_MSW@__UNIV_PLATFORM_SRC_OBJECTS_2 = coredll_animateg.o -@COND_TOOLKIT_X11@__UNIV_PLATFORM_SRC_OBJECTS_2 = coredll_animateg.o @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_SRC_OBJECTS_2 \ @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = coredll_sound_sdl.o COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ @@ -10405,6 +10359,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_windowid.o \ corelib_wrapsizer.o \ corelib_xpmdecod.o \ + corelib_animateg.o \ corelib_busyinfo.o \ corelib_buttonbar.o \ corelib_choicdgg.o \ @@ -10482,7 +10437,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ $(__LOWLEVEL_SRC_OBJECTS_7) \ $(__PLATFORM_SRC_OBJECTS_9) \ - $(__UNIV_PLATFORM_SRC_OBJECTS_3) \ corelib_generic_accel.o \ corelib_clrpickerg.o \ corelib_collpaneg.o \ @@ -10666,6 +10620,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_windowid.o \ corelib_wrapsizer.o \ corelib_xpmdecod.o \ + corelib_animateg.o \ corelib_busyinfo.o \ corelib_buttonbar.o \ corelib_choicdgg.o \ @@ -10742,7 +10697,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_fontmgrcmn.o \ - corelib_animateg.o \ corelib_generic_caret.o \ corelib_generic_colour.o \ corelib_generic_icon.o \ @@ -11115,8 +11069,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \ corelib_gtk1_tglbtn.o \ corelib_gtk1_taskbar.o \ corelib_generic_activityindicator.o \ - corelib_gtk1_eggtrayicon.o \ - corelib_animateg.o + corelib_gtk1_eggtrayicon.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3) COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_generic_accel.o \ @@ -11381,7 +11334,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_generic_statline.o \ corelib_generic_statusbr.o \ corelib_tabg.o \ - corelib_animateg.o \ corelib_generic_activityindicator.o @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3) COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ @@ -11443,7 +11395,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \ corelib_msw_treectrl.o \ corelib_systhemectrl.o \ corelib_customdraw.o \ - corelib_animateg.o \ corelib_commandlinkbutton.o \ corelib_msw_bmpcbox.o \ corelib_msw_hyperlink.o \ @@ -11497,7 +11448,6 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_cocoa_settings.o \ corelib_cocoa_overlay.o \ corelib_cocoa_aboutdlg.o \ - corelib_animateg.o \ corelib_dataview_osx.o \ corelib_cocoa_notifmsg.o \ corelib_cocoa_taskbar.o \ @@ -11536,7 +11486,6 @@ COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 = \ corelib_iphone_settings.o \ corelib_sound_osx.o \ corelib_core_sound.o \ - corelib_animateg.o \ corelib_iphone_statbmp.o @COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3) COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \ @@ -11551,7 +11500,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \ corelib_generic_imaglist.o \ corelib_prntdlgg.o \ corelib_generic_textmeasure.o \ - corelib_animateg.o \ corelib_generic_activityindicator.o \ corelib_qt_accel.o \ corelib_qt_app.o \ @@ -11651,7 +11599,6 @@ COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_3 = \ @COND_PLATFORM_WIN32_1@__QT_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_3) COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontmgrcmn.o \ - corelib_animateg.o \ corelib_generic_caret.o \ corelib_generic_colour.o \ corelib_generic_icon.o \ @@ -11977,10 +11924,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_x11_window.o \ corelib_displayx11.o @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__UNIV_PLATFORM_SRC_OBJECTS_3 \ -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = corelib_animateg.o -@COND_TOOLKIT_MSW@__UNIV_PLATFORM_SRC_OBJECTS_3 = corelib_animateg.o -@COND_TOOLKIT_X11@__UNIV_PLATFORM_SRC_OBJECTS_3 = corelib_animateg.o @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_SRC_OBJECTS_3 \ @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = corelib_sound_sdl.o @COND_SHARED_1@____wxcore_namedll_DEP = $(__coredll___depname) @@ -18993,33 +18936,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp @@ -20604,6 +20520,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp +@COND_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_USE_GUI_1@monodll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp @@ -24273,33 +24192,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp @@ -25884,6 +25776,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp +@COND_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_USE_GUI_1@monolib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp @@ -29631,33 +29526,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp @@ -31242,6 +31110,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp +@COND_USE_GUI_1@coredll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_USE_GUI_1@coredll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp @@ -33897,33 +33768,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_DFB_USE_GUI_1@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - -@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp - @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp @@ -35508,6 +35352,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp +@COND_USE_GUI_1@corelib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_USE_GUI_1@corelib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index b64f1995865b..6077e99d45d6 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -656,12 +656,6 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0[wx. COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0) -dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1[wx.bkl] ### - COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="" - fi - AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1) dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ### COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then @@ -830,12 +824,6 @@ dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1[wx.bkl] ### COND_TOOLKIT_X11_USE_GUI_1="" fi AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1) -dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1[wx.bkl] ### - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="" - fi - AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1) dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 9d7b5e5d9d13..1890f88028ca 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -353,7 +353,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/fontpickerg.h wx/generic/caret.h wx/qt/calctrl.h - wx/generic/animate.h wx/qt/dvrenderer.h wx/qt/taskbar.h wx/generic/activityindicator.h @@ -375,7 +374,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/imaglist.cpp src/generic/prntdlgg.cpp src/generic/textmeasure.cpp - src/generic/animateg.cpp src/generic/activityindicator.cpp src/qt/accel.cpp src/qt/app.cpp @@ -934,6 +932,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/windowid.cpp src/common/wrapsizer.cpp src/common/xpmdecod.cpp + src/generic/animateg.cpp src/generic/busyinfo.cpp src/generic/buttonbar.cpp src/generic/choicdgg.cpp @@ -1045,6 +1044,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gbsizer.h wx/gdicmn.h wx/generic/accel.h + wx/generic/animate.h wx/generic/buttonbar.h wx/generic/choicdgg.h wx/generic/combo.h @@ -1712,7 +1712,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk1/taskbar.cpp src/generic/activityindicator.cpp src/gtk1/eggtrayicon.c - src/generic/animateg.cpp wx/generic/clrpickerg.h @@ -1760,7 +1759,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk1/textctrl.h wx/gtk1/tglbtn.h wx/gtk1/treectrl.h - wx/generic/animate.h wx/generic/activityindicator.h @@ -1857,7 +1855,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/statline.cpp src/generic/statusbr.cpp src/generic/tabg.cpp - src/generic/animateg.cpp src/generic/activityindicator.cpp @@ -1929,8 +1926,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/motif/toolbar.h wx/motif/toplevel.h wx/motif/window.h - wx/generic/animate.h - wx/generic/animateanimate.h @@ -2154,7 +2149,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/treectrl.cpp src/msw/systhemectrl.cpp src/msw/customdraw.cpp - src/generic/animateg.cpp src/msw/commandlinkbutton.cpp src/msw/bmpcbox.cpp src/msw/hyperlink.cpp @@ -2264,7 +2258,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/rt/utils.h wx/msw/hyperlink.h wx/msw/bmpcbox.h - wx/generic/animate.h wx/msw/commandlinkbutton.h wx/msw/datetimectrl.h wx/msw/timectrl.h @@ -2328,7 +2321,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/fontmgrcmn.cpp - src/generic/animateg.cpp src/generic/caret.cpp src/generic/colour.cpp src/generic/icon.cpp @@ -2359,7 +2351,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/dfb/wrapdfb.cpp - wx/generic/animate.h wx/generic/caret.h wx/generic/colour.h wx/generic/icon.h @@ -2642,7 +2633,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/settings.mm src/osx/cocoa/overlay.mm src/osx/cocoa/aboutdlg.mm - src/generic/animateg.cpp src/osx/dataview_osx.cpp src/osx/cocoa/notifmsg.mm src/osx/cocoa/taskbar.mm @@ -2667,7 +2657,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/region.h wx/osx/cocoa/stdpaths.h wx/osx/sound.h - wx/generic/animate.h wx/osx/dvrenderer.h wx/osx/cocoa/dataview.h wx/osx/dvrenderers.h @@ -2707,7 +2696,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/iphone/settings.mm src/osx/sound_osx.cpp src/osx/core/sound.cpp - src/generic/animateg.cpp src/osx/iphone/statbmp.mm @@ -2716,7 +2704,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/iphone/evtloop.h wx/osx/iphone/private.h wx/generic/region.h - wx/generic/animate.h wx/osx/sound.h @@ -2732,35 +2719,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/univ/themes/win32.cpp - - - - src/generic/animateg.cpp - - - src/generic/animateg.cpp - - - src/generic/animateg.cpp - - - - - wx/generic/animate.h - - - wx/generic/animate.h - - - wx/generic/animate.h - - - - $(UNIV_PLATFORM_SRC) src/generic/accel.cpp src/generic/clrpickerg.cpp src/generic/collpaneg.cpp @@ -2814,9 +2773,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/activityindicator.cpp - $(UNIV_PLATFORM_HDR) wx/generic/accel.h - wx/generic/animate.h wx/generic/clrpickerg.h wx/generic/collpaneg.h wx/generic/ctrlsub.h diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index 92e79fa26f8b..9d9d31b4c52c 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -269,7 +269,6 @@ set(QT_HDR wx/qt/window.h wx/qt/dvrenderer.h wx/qt/dvrenderers.h - wx/generic/animate.h wx/qt/calctrl.h wx/qt/taskbar.h wx/qt/dataview.h @@ -369,7 +368,6 @@ set(QT_SRC src/qt/dvrenderer.cpp src/generic/activityindicator.cpp src/common/taskbarcmn.cpp - src/generic/animateg.cpp src/qt/calctrl.cpp src/qt/dataview.cpp src/qt/taskbar.cpp @@ -911,6 +909,7 @@ set(GUI_CMN_SRC src/generic/editlbox.cpp src/generic/datavgen.cpp src/generic/rowheightcache.cpp + src/generic/animateg.cpp ) set(GUI_CMN_HDR @@ -1199,6 +1198,7 @@ set(GUI_CMN_HDR wx/generic/splash.h wx/generic/calctrlg.h wx/generic/sashwin.h + wx/generic/animate.h ) set(UNIX_SRC @@ -1596,7 +1596,6 @@ set(GTK1_SRC src/gtk1/toolbar.cpp src/gtk1/textctrl.cpp src/gtk1/tglbtn.cpp - src/generic/animateg.cpp src/gtk1/eggtrayicon.c src/generic/activityindicator.cpp src/gtk1/taskbar.cpp @@ -1649,7 +1648,6 @@ set(GTK1_HDR wx/gtk1/tglbtn.h wx/gtk1/treectrl.h wx/generic/activityindicator.h - wx/generic/animate.h ) set(MOTIF_LOWLEVEL_SRC @@ -1742,7 +1740,6 @@ set(MOTIF_SRC src/generic/statline.cpp src/generic/statusbr.cpp src/generic/tabg.cpp - src/generic/animateg.cpp src/generic/activityindicator.cpp ) @@ -1815,8 +1812,6 @@ set(MOTIF_HDR wx/motif/toolbar.h wx/motif/toplevel.h wx/motif/window.h - wx/generic/animateanimate.h - wx/generic/animate.h ) set(X11_LOWLEVEL_SRC @@ -2044,7 +2039,6 @@ set(MSW_SRC src/msw/treectrl.cpp src/msw/bmpcbox.cpp src/msw/datectrl.cpp - src/generic/animateg.cpp src/msw/calctrl.cpp src/msw/datecontrols.cpp src/msw/timectrl.cpp @@ -2158,7 +2152,6 @@ set(MSW_HDR wx/msw/hyperlink.h wx/msw/datetimectrl.h wx/msw/timectrl.h - wx/generic/animate.h wx/generic/activityindicator.h ) @@ -2240,7 +2233,6 @@ set(DFB_LOWLEVEL_SRC src/dfb/utils.cpp src/dfb/window.cpp src/dfb/wrapdfb.cpp - src/generic/animateg.cpp ) set(DFB_LOWLEVEL_HDR @@ -2269,7 +2261,6 @@ set(DFB_LOWLEVEL_HDR wx/dfb/toplevel.h wx/dfb/window.h wx/dfb/wrapdfb.h - wx/generic/animate.h ) set(OSX_LOWLEVEL_SRC @@ -2524,7 +2515,6 @@ set(OSX_COCOA_SRC src/osx/cocoa/dataview.mm src/osx/carbon/sound.cpp src/osx/cocoa/taskbar.mm - src/generic/animateg.cpp src/common/taskbarcmn.cpp src/osx/dataview_osx.cpp src/osx/cocoa/notifmsg.mm @@ -2551,7 +2541,6 @@ set(OSX_COCOA_HDR wx/osx/datetimectrl.h wx/osx/taskbarosx.h wx/osx/dvrenderers.h - wx/generic/animate.h wx/osx/core/joystick.h ) @@ -2576,7 +2565,6 @@ set(OSX_IPHONE_SRC src/osx/iphone/utils.mm src/osx/iphone/window.mm src/osx/sound_osx.cpp - src/generic/animateg.cpp src/osx/core/sound.cpp src/osx/iphone/statbmp.mm ) @@ -2586,7 +2574,6 @@ set(OSX_IPHONE_HDR wx/osx/iphone/evtloop.h wx/osx/iphone/private.h wx/generic/region.h - wx/generic/animate.h wx/osx/sound.h ) @@ -2655,7 +2642,6 @@ set(UNIV_SRC set(UNIV_HDR ${UNIV_PLATFORM_HDR} wx/generic/accel.h - wx/generic/animate.h wx/generic/clrpickerg.h wx/generic/collpaneg.h wx/generic/ctrlsub.h diff --git a/build/files b/build/files index 2f26df7a7937..199228bb5304 100644 --- a/build/files +++ b/build/files @@ -213,7 +213,6 @@ QT_WIN32_HDR= QT_HDR = $(QT_PLATFORM_HDR) wx/generic/activityindicator.h - wx/generic/animate.h wx/generic/caret.h wx/generic/clrpickerg.h wx/generic/collpaneg.h @@ -303,7 +302,6 @@ QT_SRC= $(QT_PLATFORM_SRC) src/common/taskbarcmn.cpp src/generic/activityindicator.cpp - src/generic/animateg.cpp src/generic/caret.cpp src/generic/clrpickerg.cpp src/generic/collpaneg.cpp @@ -860,6 +858,7 @@ GUI_CMN_SRC = src/common/wrapsizer.cpp src/common/xpmdecod.cpp src/generic/aboutdlgg.cpp + src/generic/animateg.cpp src/generic/bannerwindow.cpp src/generic/bmpcboxg.cpp src/generic/busyinfo.cpp @@ -1017,6 +1016,7 @@ GUI_CMN_HDR = wx/gdicmn.h wx/gdiobj.h wx/generic/aboutdlgg.h + wx/generic/animate.h wx/generic/accel.h wx/generic/bmpcbox.h wx/generic/busyinfo.h @@ -1554,7 +1554,6 @@ GTK1_SRC = # Generic implementations used by wxGTK1: src/generic/accel.cpp src/generic/activityindicator.cpp - src/generic/animateg.cpp src/generic/clrpickerg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp @@ -1604,7 +1603,6 @@ GTK1_SRC = GTK1_HDR = wx/generic/activityindicator.h - wx/generic/animate.h wx/generic/clrpickerg.h wx/generic/collpaneg.h wx/generic/colrdlgg.h @@ -1726,7 +1724,6 @@ MOTIF_SRC = src/motif/xmcombo/xmcombo.c # Generic files used by wxMotif: src/generic/activityindicator.cpp - src/generic/animateg.cpp src/generic/clrpickerg.cpp src/generic/collpaneg.cpp src/generic/colrdlgg.cpp @@ -1744,8 +1741,6 @@ MOTIF_SRC = src/generic/tabg.cpp MOTIF_HDR = - wx/generic/animateanimate.h - wx/generic/animate.h wx/generic/clrpickerg.h wx/generic/collpaneg.h wx/generic/colrdlgg.h @@ -1971,7 +1966,6 @@ MSW_LOWLEVEL_HDR = MSW_SRC = src/generic/activityindicator.cpp - src/generic/animateg.cpp src/generic/clrpickerg.cpp src/generic/collpaneg.cpp src/generic/filepickerg.cpp @@ -2041,7 +2035,6 @@ MSW_SRC = MSW_HDR = wx/generic/activityindicator.h - wx/generic/animate.h wx/generic/clrpickerg.h wx/generic/collpaneg.h wx/generic/filepickerg.h @@ -2196,7 +2189,6 @@ MSW_DESKTOP_HDR = DFB_LOWLEVEL_SRC = src/common/fontmgrcmn.cpp - src/generic/animateg.cpp src/generic/caret.cpp src/generic/colour.cpp src/generic/icon.cpp @@ -2225,7 +2217,6 @@ DFB_LOWLEVEL_SRC = src/dfb/window.cpp src/dfb/wrapdfb.cpp DFB_LOWLEVEL_HDR = - wx/generic/animate.h wx/generic/caret.h wx/generic/colour.h wx/generic/icon.h @@ -2457,7 +2448,6 @@ OSX_SHARED_HDR = OSX_COCOA_SRC = $(OSX_COMMON_SRC) src/common/taskbarcmn.cpp - src/generic/animateg.cpp src/osx/carbon/sound.cpp src/osx/cocoa/aboutdlg.mm src/osx/cocoa/activityindicator.mm @@ -2513,7 +2503,6 @@ OSX_COCOA_SRC = src/osx/timectrl_osx.cpp OSX_COCOA_HDR = - wx/generic/animate.h wx/generic/region.h wx/osx/activityindicator.h wx/osx/cocoa/chkconf.h @@ -2538,7 +2527,6 @@ OSX_COCOA_HDR = OSX_IPHONE_SRC = $(OSX_COMMON_SRC) - src/generic/animateg.cpp src/generic/regiong.cpp src/osx/core/sound.cpp src/osx/iphone/anybutton.mm @@ -2561,7 +2549,6 @@ OSX_IPHONE_SRC = src/osx/sound_osx.cpp OSX_IPHONE_HDR = - wx/generic/animate.h wx/generic/region.h wx/osx/iphone/chkconf.h wx/osx/iphone/evtloop.h @@ -2633,7 +2620,6 @@ UNIV_HDR = $(UNIV_PLATFORM_HDR) wx/generic/accel.h wx/generic/activityindicator.h - wx/generic/animate.h wx/generic/clrpickerg.h wx/generic/collpaneg.h wx/generic/ctrlsub.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 0101d2bf16f3..d812ac6e552f 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1930,7 +1930,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectrl.obj \ $(OBJS)\monodll_systhemectrl.obj \ $(OBJS)\monodll_customdraw.obj \ - $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_commandlinkbutton.obj \ $(OBJS)\monodll_bmpcbox.obj \ $(OBJS)\monodll_hyperlink.obj \ @@ -2071,6 +2070,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_windowid.obj \ $(OBJS)\monodll_wrapsizer.obj \ $(OBJS)\monodll_xpmdecod.obj \ + $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_generic_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ @@ -2214,7 +2214,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_access.obj \ - $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_generic_accel.obj \ $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_collpaneg.obj \ @@ -2398,6 +2397,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_windowid.obj \ $(OBJS)\monodll_wrapsizer.obj \ $(OBJS)\monodll_xpmdecod.obj \ + $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_generic_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ @@ -2765,7 +2765,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectrl.obj \ $(OBJS)\monolib_systhemectrl.obj \ $(OBJS)\monolib_customdraw.obj \ - $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_commandlinkbutton.obj \ $(OBJS)\monolib_bmpcbox.obj \ $(OBJS)\monolib_hyperlink.obj \ @@ -2906,6 +2905,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_windowid.obj \ $(OBJS)\monolib_wrapsizer.obj \ $(OBJS)\monolib_xpmdecod.obj \ + $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_generic_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ @@ -3049,7 +3049,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_access.obj \ - $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_generic_accel.obj \ $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_collpaneg.obj \ @@ -3233,6 +3232,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_windowid.obj \ $(OBJS)\monolib_wrapsizer.obj \ $(OBJS)\monolib_xpmdecod.obj \ + $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_generic_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ @@ -3472,7 +3472,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectrl.obj \ $(OBJS)\coredll_systhemectrl.obj \ $(OBJS)\coredll_customdraw.obj \ - $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_commandlinkbutton.obj \ $(OBJS)\coredll_bmpcbox.obj \ $(OBJS)\coredll_hyperlink.obj \ @@ -3613,6 +3612,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_windowid.obj \ $(OBJS)\coredll_wrapsizer.obj \ $(OBJS)\coredll_xpmdecod.obj \ + $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ @@ -3756,7 +3756,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_access.obj \ - $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_generic_accel.obj \ $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_collpaneg.obj \ @@ -3940,6 +3939,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_windowid.obj \ $(OBJS)\coredll_wrapsizer.obj \ $(OBJS)\coredll_xpmdecod.obj \ + $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ @@ -4145,7 +4145,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectrl.obj \ $(OBJS)\corelib_systhemectrl.obj \ $(OBJS)\corelib_customdraw.obj \ - $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_commandlinkbutton.obj \ $(OBJS)\corelib_bmpcbox.obj \ $(OBJS)\corelib_hyperlink.obj \ @@ -4286,6 +4285,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_windowid.obj \ $(OBJS)\corelib_wrapsizer.obj \ $(OBJS)\corelib_xpmdecod.obj \ + $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ @@ -4429,7 +4429,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_access.obj \ - $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_generic_accel.obj \ $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_collpaneg.obj \ @@ -4613,6 +4612,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_windowid.obj \ $(OBJS)\corelib_wrapsizer.obj \ $(OBJS)\corelib_xpmdecod.obj \ + $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ @@ -7969,11 +7969,6 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp @@ -8619,6 +8614,11 @@ $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp @@ -10526,11 +10526,6 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp @@ -11176,6 +11171,11 @@ $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp @@ -13038,11 +13038,6 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp @@ -13688,6 +13683,11 @@ $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp @@ -14773,11 +14773,6 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp @@ -15423,6 +15418,11 @@ $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 3cfaea2bf3aa..43c628c6dc74 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1954,7 +1954,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectrl.o \ $(OBJS)\monodll_systhemectrl.o \ $(OBJS)\monodll_customdraw.o \ - $(OBJS)\monodll_animateg.o \ $(OBJS)\monodll_commandlinkbutton.o \ $(OBJS)\monodll_bmpcbox.o \ $(OBJS)\monodll_hyperlink.o \ @@ -2095,6 +2094,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_windowid.o \ $(OBJS)\monodll_wrapsizer.o \ $(OBJS)\monodll_xpmdecod.o \ + $(OBJS)\monodll_animateg.o \ $(OBJS)\monodll_busyinfo.o \ $(OBJS)\monodll_generic_buttonbar.o \ $(OBJS)\monodll_choicdgg.o \ @@ -2240,7 +2240,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_evtloop.o \ $(OBJS)\monodll_access.o \ - $(OBJS)\monodll_animateg.o \ $(OBJS)\monodll_generic_accel.o \ $(OBJS)\monodll_clrpickerg.o \ $(OBJS)\monodll_collpaneg.o \ @@ -2424,6 +2423,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_windowid.o \ $(OBJS)\monodll_wrapsizer.o \ $(OBJS)\monodll_xpmdecod.o \ + $(OBJS)\monodll_animateg.o \ $(OBJS)\monodll_busyinfo.o \ $(OBJS)\monodll_generic_buttonbar.o \ $(OBJS)\monodll_choicdgg.o \ @@ -2795,7 +2795,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectrl.o \ $(OBJS)\monolib_systhemectrl.o \ $(OBJS)\monolib_customdraw.o \ - $(OBJS)\monolib_animateg.o \ $(OBJS)\monolib_commandlinkbutton.o \ $(OBJS)\monolib_bmpcbox.o \ $(OBJS)\monolib_hyperlink.o \ @@ -2936,6 +2935,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_windowid.o \ $(OBJS)\monolib_wrapsizer.o \ $(OBJS)\monolib_xpmdecod.o \ + $(OBJS)\monolib_animateg.o \ $(OBJS)\monolib_busyinfo.o \ $(OBJS)\monolib_generic_buttonbar.o \ $(OBJS)\monolib_choicdgg.o \ @@ -3081,7 +3081,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_evtloop.o \ $(OBJS)\monolib_access.o \ - $(OBJS)\monolib_animateg.o \ $(OBJS)\monolib_generic_accel.o \ $(OBJS)\monolib_clrpickerg.o \ $(OBJS)\monolib_collpaneg.o \ @@ -3265,6 +3264,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_windowid.o \ $(OBJS)\monolib_wrapsizer.o \ $(OBJS)\monolib_xpmdecod.o \ + $(OBJS)\monolib_animateg.o \ $(OBJS)\monolib_busyinfo.o \ $(OBJS)\monolib_generic_buttonbar.o \ $(OBJS)\monolib_choicdgg.o \ @@ -3518,7 +3518,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectrl.o \ $(OBJS)\coredll_systhemectrl.o \ $(OBJS)\coredll_customdraw.o \ - $(OBJS)\coredll_animateg.o \ $(OBJS)\coredll_commandlinkbutton.o \ $(OBJS)\coredll_bmpcbox.o \ $(OBJS)\coredll_hyperlink.o \ @@ -3659,6 +3658,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_windowid.o \ $(OBJS)\coredll_wrapsizer.o \ $(OBJS)\coredll_xpmdecod.o \ + $(OBJS)\coredll_animateg.o \ $(OBJS)\coredll_busyinfo.o \ $(OBJS)\coredll_buttonbar.o \ $(OBJS)\coredll_choicdgg.o \ @@ -3804,7 +3804,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_evtloop.o \ $(OBJS)\coredll_access.o \ - $(OBJS)\coredll_animateg.o \ $(OBJS)\coredll_generic_accel.o \ $(OBJS)\coredll_clrpickerg.o \ $(OBJS)\coredll_collpaneg.o \ @@ -3988,6 +3987,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_windowid.o \ $(OBJS)\coredll_wrapsizer.o \ $(OBJS)\coredll_xpmdecod.o \ + $(OBJS)\coredll_animateg.o \ $(OBJS)\coredll_busyinfo.o \ $(OBJS)\coredll_buttonbar.o \ $(OBJS)\coredll_choicdgg.o \ @@ -4199,7 +4199,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectrl.o \ $(OBJS)\corelib_systhemectrl.o \ $(OBJS)\corelib_customdraw.o \ - $(OBJS)\corelib_animateg.o \ $(OBJS)\corelib_commandlinkbutton.o \ $(OBJS)\corelib_bmpcbox.o \ $(OBJS)\corelib_hyperlink.o \ @@ -4340,6 +4339,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_windowid.o \ $(OBJS)\corelib_wrapsizer.o \ $(OBJS)\corelib_xpmdecod.o \ + $(OBJS)\corelib_animateg.o \ $(OBJS)\corelib_busyinfo.o \ $(OBJS)\corelib_buttonbar.o \ $(OBJS)\corelib_choicdgg.o \ @@ -4485,7 +4485,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_evtloop.o \ $(OBJS)\corelib_access.o \ - $(OBJS)\corelib_animateg.o \ $(OBJS)\corelib_generic_accel.o \ $(OBJS)\corelib_clrpickerg.o \ $(OBJS)\corelib_collpaneg.o \ @@ -4669,6 +4668,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_windowid.o \ $(OBJS)\corelib_wrapsizer.o \ $(OBJS)\corelib_xpmdecod.o \ + $(OBJS)\corelib_animateg.o \ $(OBJS)\corelib_busyinfo.o \ $(OBJS)\corelib_buttonbar.o \ $(OBJS)\corelib_choicdgg.o \ @@ -8272,11 +8272,6 @@ $(OBJS)\monodll_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8922,6 +8917,11 @@ $(OBJS)\monodll_xpmdecod.o: ../../src/common/xpmdecod.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_busyinfo.o: ../../src/generic/busyinfo.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -10829,11 +10829,6 @@ $(OBJS)\monolib_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -11479,6 +11474,11 @@ $(OBJS)\monolib_xpmdecod.o: ../../src/common/xpmdecod.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_busyinfo.o: ../../src/generic/busyinfo.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -13341,11 +13341,6 @@ $(OBJS)\coredll_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_activityindicator.o: ../../src/generic/activityindicator.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13991,6 +13986,11 @@ $(OBJS)\coredll_xpmdecod.o: ../../src/common/xpmdecod.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_animateg.o: ../../src/generic/animateg.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_busyinfo.o: ../../src/generic/busyinfo.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15076,11 +15076,6 @@ $(OBJS)\corelib_prntdlgg.o: ../../src/generic/prntdlgg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_activityindicator.o: ../../src/generic/activityindicator.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -15726,6 +15721,11 @@ $(OBJS)\corelib_xpmdecod.o: ../../src/common/xpmdecod.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_animateg.o: ../../src/generic/animateg.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_busyinfo.o: ../../src/generic/busyinfo.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index cedf95f411bf..f1d7016dbad8 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2438,7 +2438,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectrl.obj \ $(OBJS)\monodll_systhemectrl.obj \ $(OBJS)\monodll_customdraw.obj \ - $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_commandlinkbutton.obj \ $(OBJS)\monodll_bmpcbox.obj \ $(OBJS)\monodll_hyperlink.obj \ @@ -2579,6 +2578,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_windowid.obj \ $(OBJS)\monodll_wrapsizer.obj \ $(OBJS)\monodll_xpmdecod.obj \ + $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_generic_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ @@ -2722,7 +2722,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_evtloop.obj \ $(OBJS)\monodll_access.obj \ - $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_generic_accel.obj \ $(OBJS)\monodll_clrpickerg.obj \ $(OBJS)\monodll_collpaneg.obj \ @@ -2906,6 +2905,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_windowid.obj \ $(OBJS)\monodll_wrapsizer.obj \ $(OBJS)\monodll_xpmdecod.obj \ + $(OBJS)\monodll_animateg.obj \ $(OBJS)\monodll_busyinfo.obj \ $(OBJS)\monodll_generic_buttonbar.obj \ $(OBJS)\monodll_choicdgg.obj \ @@ -3279,7 +3279,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectrl.obj \ $(OBJS)\monolib_systhemectrl.obj \ $(OBJS)\monolib_customdraw.obj \ - $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_commandlinkbutton.obj \ $(OBJS)\monolib_bmpcbox.obj \ $(OBJS)\monolib_hyperlink.obj \ @@ -3420,6 +3419,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_windowid.obj \ $(OBJS)\monolib_wrapsizer.obj \ $(OBJS)\monolib_xpmdecod.obj \ + $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_generic_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ @@ -3563,7 +3563,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_evtloop.obj \ $(OBJS)\monolib_access.obj \ - $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_generic_accel.obj \ $(OBJS)\monolib_clrpickerg.obj \ $(OBJS)\monolib_collpaneg.obj \ @@ -3747,6 +3746,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_windowid.obj \ $(OBJS)\monolib_wrapsizer.obj \ $(OBJS)\monolib_xpmdecod.obj \ + $(OBJS)\monolib_animateg.obj \ $(OBJS)\monolib_busyinfo.obj \ $(OBJS)\monolib_generic_buttonbar.obj \ $(OBJS)\monolib_choicdgg.obj \ @@ -4052,7 +4052,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectrl.obj \ $(OBJS)\coredll_systhemectrl.obj \ $(OBJS)\coredll_customdraw.obj \ - $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_commandlinkbutton.obj \ $(OBJS)\coredll_bmpcbox.obj \ $(OBJS)\coredll_hyperlink.obj \ @@ -4193,6 +4192,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_windowid.obj \ $(OBJS)\coredll_wrapsizer.obj \ $(OBJS)\coredll_xpmdecod.obj \ + $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ @@ -4336,7 +4336,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_evtloop.obj \ $(OBJS)\coredll_access.obj \ - $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_generic_accel.obj \ $(OBJS)\coredll_clrpickerg.obj \ $(OBJS)\coredll_collpaneg.obj \ @@ -4520,6 +4519,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_windowid.obj \ $(OBJS)\coredll_wrapsizer.obj \ $(OBJS)\coredll_xpmdecod.obj \ + $(OBJS)\coredll_animateg.obj \ $(OBJS)\coredll_busyinfo.obj \ $(OBJS)\coredll_buttonbar.obj \ $(OBJS)\coredll_choicdgg.obj \ @@ -4731,7 +4731,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectrl.obj \ $(OBJS)\corelib_systhemectrl.obj \ $(OBJS)\corelib_customdraw.obj \ - $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_commandlinkbutton.obj \ $(OBJS)\corelib_bmpcbox.obj \ $(OBJS)\corelib_hyperlink.obj \ @@ -4872,6 +4871,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_windowid.obj \ $(OBJS)\corelib_wrapsizer.obj \ $(OBJS)\corelib_xpmdecod.obj \ + $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ @@ -5015,7 +5015,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_evtloop.obj \ $(OBJS)\corelib_access.obj \ - $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_generic_accel.obj \ $(OBJS)\corelib_clrpickerg.obj \ $(OBJS)\corelib_collpaneg.obj \ @@ -5199,6 +5198,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_windowid.obj \ $(OBJS)\corelib_wrapsizer.obj \ $(OBJS)\corelib_xpmdecod.obj \ + $(OBJS)\corelib_animateg.obj \ $(OBJS)\corelib_busyinfo.obj \ $(OBJS)\corelib_buttonbar.obj \ $(OBJS)\corelib_choicdgg.obj \ @@ -8887,11 +8887,6 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp @@ -9537,6 +9532,11 @@ $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp @@ -11444,11 +11444,6 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp @@ -12094,6 +12089,11 @@ $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp @@ -13956,11 +13956,6 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp @@ -14606,6 +14601,11 @@ $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp @@ -15691,11 +15691,6 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp @@ -16341,6 +16336,11 @@ $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp diff --git a/configure b/configure index e694f0985abc..85eaf7eecc2d 100755 --- a/configure +++ b/configure @@ -699,7 +699,6 @@ COND_USE_EXCEPTIONS_1 COND_USE_EXCEPTIONS_0 COND_USE_CAIRO_1 COND_UNICODE_1 -COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11 COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 @@ -728,7 +727,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3 -COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 @@ -1030,7 +1028,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1457,7 +1454,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1710,15 +1706,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1856,7 +1843,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2009,7 +1996,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -39964,11 +39950,6 @@ EOF COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="" - fi - COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="" @@ -40109,11 +40090,6 @@ EOF COND_TOOLKIT_X11_USE_GUI_1="" fi - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="" - fi - COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then COND_UNICODE_1="" diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index 379e9ee3ec3c..2a23d7381e73 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -185,6 +185,7 @@ Currently the following symbols exist: decide whether some function should be overloaded for both long and long long types.} @itemdef{wxHAS_MULTIPLE_FILEDLG_FILTERS, Defined if wxFileDialog supports multiple ('|'-separated) filters.} +@itemdef{wxHAS_NATIVE_ANIMATIONCTRL, Defined if native wxAnimationCtrl class is being used (this symbol only exists in wxWidgets 3.1.4 and later).} @itemdef{wxHAS_NATIVE_DATAVIEWCTRL, Defined if native wxDataViewCtrl class is being used (this symbol only exists in wxWidgets 3.1.4 and later).} @itemdef{wxHAS_NATIVE_WINDOW, Defined if wxNativeWindow class is available.} @itemdef{wxHAS_NULLPTR_T, Defined if the currently used compiler supports C++11 @c nullptr.} diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h index 4a112410c83b..bc24dd57cad3 100644 --- a/include/wx/anidecod.h +++ b/include/wx/anidecod.h @@ -53,11 +53,12 @@ class WXDLLIMPEXP_CORE wxANIDecoder : public wxAnimationDecoder wxAnimationType GetType() const wxOVERRIDE { return wxANIMATION_TYPE_ANI; } -private: +protected: // wxAnimationDecoder pure virtual: virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; // modifies current stream position (see wxAnimationDecoder::CanRead) +private: // frames stored as wxImage(s): ANI files are meant to be used mostly for animated // cursors and thus they do not use any optimization to encode differences between // two frames: they are just a list of images to display sequentially. diff --git a/include/wx/animate.h b/include/wx/animate.h index 63e188b863a3..6c076f3b8558 100644 --- a/include/wx/animate.h +++ b/include/wx/animate.h @@ -21,38 +21,61 @@ #include "wx/bitmap.h" class WXDLLIMPEXP_FWD_CORE wxAnimation; +class wxAnimationImpl; extern WXDLLIMPEXP_DATA_CORE(wxAnimation) wxNullAnimation; extern WXDLLIMPEXP_DATA_CORE(const char) wxAnimationCtrlNameStr[]; +WX_DECLARE_LIST_WITH_DECL(wxAnimationDecoder, wxAnimationDecoderList, class WXDLLIMPEXP_CORE); // ---------------------------------------------------------------------------- -// wxAnimationBase +// wxAnimation // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxAnimationBase : public wxObject +class WXDLLIMPEXP_CORE wxAnimation : public wxObject { public: - wxAnimationBase() {} + wxAnimation(); + explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY); + wxAnimation(const wxAnimation& other); - virtual bool IsOk() const = 0; + wxAnimation& operator=(const wxAnimation& other); - // can be -1 - virtual int GetDelay(unsigned int frame) const = 0; + bool IsOk() const; + bool IsCompatibleWith(wxClassInfo* ci) const; - virtual unsigned int GetFrameCount() const = 0; - virtual wxImage GetFrame(unsigned int frame) const = 0; - virtual wxSize GetSize() const = 0; + int GetDelay(unsigned int frame) const; + unsigned int GetFrameCount() const; + wxImage GetFrame(unsigned int frame); + wxSize GetSize() const; - virtual bool LoadFile(const wxString& name, - wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; - virtual bool Load(wxInputStream& stream, - wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; + bool LoadFile(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY); + bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY); + + // Methods for managing the list of decoders + static inline wxAnimationDecoderList& GetHandlers() { return sm_handlers; } + static void AddHandler(wxAnimationDecoder *handler); + static void InsertHandler(wxAnimationDecoder *handler); + static const wxAnimationDecoder *FindHandler( wxAnimationType animType ); + + static void CleanUpHandlers(); + static void InitStandardHandlers(); protected: - wxDECLARE_ABSTRACT_CLASS(wxAnimationBase); -}; + wxAnimationImpl* GetImpl() const; + +private: + static wxAnimationDecoderList sm_handlers; + + // Ctor used by wxAnimationCtrl::CreateAnimation() only. + explicit wxAnimation(wxAnimationImpl* impl); + + // Give it permission to create objects of this class using specific impl + // and access our GetImpl(). + friend class wxAnimationCtrlBase; + wxDECLARE_DYNAMIC_CLASS(wxAnimation); +}; // ---------------------------------------------------------------------------- @@ -78,7 +101,7 @@ class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; virtual void SetAnimation(const wxAnimation &anim) = 0; - virtual wxAnimation GetAnimation() const = 0; + wxAnimation GetAnimation() const { return m_animation; } virtual bool Play() = 0; virtual void Stop() = 0; @@ -91,7 +114,23 @@ class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl wxBitmap GetInactiveBitmap() const { return m_bmpStatic; } + wxAnimation CreateAnimation() const + { return MakeAnimFromImpl(DoCreateAnimationImpl()); } + protected: + virtual wxAnimationImpl* DoCreateAnimationImpl() const = 0; + + // These methods allow derived classes access to private wxAnimation ctor + // and wxAnimation::GetImpl(), respectively. + static wxAnimation MakeAnimFromImpl(wxAnimationImpl* impl) + { return wxAnimation(impl); } + + wxAnimationImpl* GetAnimImpl() const + { return m_animation.GetImpl(); } + + // The associated animation, possibly invalid/empty. + wxAnimation m_animation; + // the inactive bitmap as it was set by the user wxBitmap m_bmpStatic; @@ -104,9 +143,6 @@ class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl // called by SetInactiveBitmap virtual void DisplayStaticImage() = 0; - -private: - wxDECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase); }; @@ -116,9 +152,31 @@ class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/animate.h" + + #define wxHAS_NATIVE_ANIMATIONCTRL #else #include "wx/generic/animate.h" -#endif + + class WXDLLIMPEXP_ADV wxAnimationCtrl : public wxGenericAnimationCtrl + { + public: + wxAnimationCtrl() + : wxGenericAnimationCtrl() + {} + wxAnimationCtrl(wxWindow *parent, + wxWindowID id, + const wxAnimation& anim = wxNullAnimation, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxAC_DEFAULT_STYLE, + const wxString& name = wxAnimationCtrlNameStr) + : wxGenericAnimationCtrl(parent, id, anim, pos, size, style, name) + {} + + private: + wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrl); + }; +#endif // defined(__WXGTK20__) #endif // wxUSE_ANIMATIONCTRL diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h index 80157f59faa8..54487b21ee06 100644 --- a/include/wx/generic/animate.h +++ b/include/wx/generic/animate.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/generic/animate.h -// Purpose: wxAnimation and wxAnimationCtrl +// Purpose: wxGenericAnimationCtrl // Author: Julian Smart and Guillermo Rodriguez Garcia // Modified by: Francesco Montorsi // Created: 13/8/99 @@ -13,70 +13,22 @@ #include "wx/bitmap.h" -// ---------------------------------------------------------------------------- -// wxAnimation -// ---------------------------------------------------------------------------- - -WX_DECLARE_LIST_WITH_DECL(wxAnimationDecoder, wxAnimationDecoderList, class WXDLLIMPEXP_ADV); - -class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase -{ -public: - wxAnimation() {} - wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) - { LoadFile(name, type); } - - virtual bool IsOk() const wxOVERRIDE - { return m_refData != NULL; } - - virtual unsigned int GetFrameCount() const wxOVERRIDE; - virtual int GetDelay(unsigned int i) const wxOVERRIDE; - virtual wxImage GetFrame(unsigned int i) const wxOVERRIDE; - virtual wxSize GetSize() const wxOVERRIDE; - - virtual bool LoadFile(const wxString& filename, - wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual bool Load(wxInputStream& stream, - wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - - // extended interface used by the generic implementation of wxAnimationCtrl - wxPoint GetFramePosition(unsigned int frame) const; - wxSize GetFrameSize(unsigned int frame) const; - wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; - wxColour GetTransparentColour(unsigned int frame) const; - wxColour GetBackgroundColour() const; - -protected: - static wxAnimationDecoderList sm_handlers; - -public: - static inline wxAnimationDecoderList& GetHandlers() { return sm_handlers; } - static void AddHandler(wxAnimationDecoder *handler); - static void InsertHandler(wxAnimationDecoder *handler); - static const wxAnimationDecoder *FindHandler( wxAnimationType animType ); - - static void CleanUpHandlers(); - static void InitStandardHandlers(); - - wxDECLARE_DYNAMIC_CLASS(wxAnimation); -}; - // ---------------------------------------------------------------------------- -// wxAnimationCtrl +// wxGenericAnimationCtrl // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase +class WXDLLIMPEXP_ADV wxGenericAnimationCtrl: public wxAnimationCtrlBase { public: - wxAnimationCtrl() { Init(); } - wxAnimationCtrl(wxWindow *parent, - wxWindowID id, - const wxAnimation& anim = wxNullAnimation, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAC_DEFAULT_STYLE, - const wxString& name = wxAnimationCtrlNameStr) + wxGenericAnimationCtrl() { Init(); } + wxGenericAnimationCtrl(wxWindow *parent, + wxWindowID id, + const wxAnimation& anim = wxNullAnimation, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxAC_DEFAULT_STYLE, + const wxString& name = wxAnimationCtrlNameStr) { Init(); @@ -92,7 +44,8 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase long style = wxAC_DEFAULT_STYLE, const wxString& name = wxAnimationCtrlNameStr); - ~wxAnimationCtrl(); + ~wxGenericAnimationCtrl(); + public: virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; @@ -105,14 +58,14 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase { return m_isPlaying; } void SetAnimation(const wxAnimation &animation) wxOVERRIDE; - wxAnimation GetAnimation() const wxOVERRIDE - { return m_animation; } virtual void SetInactiveBitmap(const wxBitmap &bmp) wxOVERRIDE; // override base class method virtual bool SetBackgroundColour(const wxColour& col) wxOVERRIDE; + static wxAnimation CreateCompatibleAnimation(); + public: // event handlers void OnPaint(wxPaintEvent& event); @@ -140,6 +93,7 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase { return m_backingStore; } protected: // internal utilities + virtual wxAnimationImpl* DoCreateAnimationImpl() const wxOVERRIDE; // resize this control to fit m_animation void FitToAnimation(); @@ -156,11 +110,19 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase virtual void DisplayStaticImage() wxOVERRIDE; virtual wxSize DoGetBestSize() const wxOVERRIDE; + // Helpers to safely access methods in the wxAnimationGenericImpl that are + // specific to the generic implementation + wxPoint AnimationImplGetFramePosition(unsigned int frame) const; + wxSize AnimationImplGetFrameSize(unsigned int frame) const; + wxAnimationDisposal AnimationImplGetDisposalMethod(unsigned int frame) const; + wxColour AnimationImplGetTransparentColour(unsigned int frame) const; + wxColour AnimationImplGetBackgroundColour() const; + + protected: unsigned int m_currentFrame; // Current frame bool m_looped; // Looped, or not wxTimer m_timer; // The timer - wxAnimation m_animation; // The animation bool m_isPlaying; // Is the animation playing? bool m_useWinBackgroundColour; // Use animation bg colour or window bg colour? @@ -170,7 +132,7 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase private: typedef wxAnimationCtrlBase base_type; - wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrl); + wxDECLARE_DYNAMIC_CLASS(wxGenericAnimationCtrl); wxDECLARE_EVENT_TABLE(); }; diff --git a/include/wx/generic/private/animate.h b/include/wx/generic/private/animate.h new file mode 100644 index 000000000000..9906b0c8933b --- /dev/null +++ b/include/wx/generic/private/animate.h @@ -0,0 +1,56 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/generic/private/animate.h +// Purpose: wxAnimationGenericImpl +// Author: Julian Smart and Guillermo Rodriguez Garcia +// Modified by: Francesco Montorsi +// Created: 13/8/99 +// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GENERIC_PRIVATE_ANIMATEH__ +#define _WX_GENERIC_PRIVATE_ANIMATEH__ + +#include "wx/private/animate.h" + +// ---------------------------------------------------------------------------- +// wxAnimationGenericImpl +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxAnimationGenericImpl : public wxAnimationImpl +{ +public: + wxAnimationGenericImpl() : m_decoder(NULL) {} + virtual ~wxAnimationGenericImpl() { UnRef(); } + + virtual bool IsOk() const wxOVERRIDE + { return m_decoder != NULL; } + virtual bool IsCompatibleWith(wxClassInfo* ci) const wxOVERRIDE; + + virtual unsigned int GetFrameCount() const wxOVERRIDE; + virtual int GetDelay(unsigned int i) const wxOVERRIDE; + virtual wxImage GetFrame(unsigned int i) const wxOVERRIDE; + virtual wxSize GetSize() const wxOVERRIDE; + + virtual bool LoadFile(const wxString& filename, + wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + virtual bool Load(wxInputStream& stream, + wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + + // extended interface used only by the generic implementation of wxAnimationCtrl + virtual wxPoint GetFramePosition(unsigned int frame) const; + virtual wxSize GetFrameSize(unsigned int frame) const; + virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; + virtual wxColour GetTransparentColour(unsigned int frame) const; + virtual wxColour GetBackgroundColour() const; + +private: + void UnRef(); + + wxAnimationDecoder* m_decoder; + + wxDECLARE_NO_COPY_CLASS(wxAnimationGenericImpl); +}; + + +#endif // _WX_GENERIC_PRIVATE_ANIMATEH__ diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h index b0de4669e6c7..5dee4caf243d 100644 --- a/include/wx/gifdecod.h +++ b/include/wx/gifdecod.h @@ -85,11 +85,12 @@ class WXDLLIMPEXP_CORE wxGIFDecoder : public wxAnimationDecoder wxAnimationType GetType() const wxOVERRIDE { return wxANIMATION_TYPE_GIF; } -private: +protected: // wxAnimationDecoder pure virtual virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; // modifies current stream position (see wxAnimationDecoder::CanRead) +private: int getcode(wxInputStream& stream, int bits, int abfin); wxGIFErrorCode dgif(wxInputStream& stream, GIFImage *img, int interl, int bits); diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h index f07fdea939dd..6b8ab3ac9b5d 100644 --- a/include/wx/gtk/animate.h +++ b/include/wx/gtk/animate.h @@ -14,62 +14,6 @@ typedef struct _GdkPixbufAnimation GdkPixbufAnimation; typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter; -// ---------------------------------------------------------------------------- -// wxAnimation -// Unlike the generic wxAnimation object (see generic\animate.cpp), we won't -// use directly wxAnimationHandlers as gdk-pixbuf already provides the -// concept of handler and will automatically use the available handlers. -// Like generic wxAnimation object, this implementation of wxAnimation is -// refcounted so that assignment is very fast -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase -{ -public: - wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) - : m_pixbuf(NULL) { LoadFile(name, type); } - wxAnimation(GdkPixbufAnimation *p = NULL); - wxAnimation(const wxAnimation&); - ~wxAnimation() { UnRef(); } - - wxAnimation& operator= (const wxAnimation&); - - virtual bool IsOk() const wxOVERRIDE - { return m_pixbuf != NULL; } - - - // unfortunately GdkPixbufAnimation does not expose these info: - - virtual unsigned int GetFrameCount() const wxOVERRIDE { return 0; } - virtual wxImage GetFrame(unsigned int frame) const wxOVERRIDE; - - // we can retrieve the delay for a frame only after building - // a GdkPixbufAnimationIter... - virtual int GetDelay(unsigned int WXUNUSED(frame)) const wxOVERRIDE { return 0; } - - virtual wxSize GetSize() const wxOVERRIDE; - - virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - - // Implementation -public: // used by GTK callbacks - - GdkPixbufAnimation *GetPixbuf() const - { return m_pixbuf; } - void SetPixbuf(GdkPixbufAnimation* p); - -protected: - GdkPixbufAnimation *m_pixbuf; - -private: - void UnRef(); - - typedef wxAnimationBase base_type; - wxDECLARE_DYNAMIC_CLASS(wxAnimation); -}; - - // ---------------------------------------------------------------------------- // wxAnimationCtrl // ---------------------------------------------------------------------------- @@ -112,9 +56,7 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; - virtual void SetAnimation(const wxAnimation &anim) wxOVERRIDE; - virtual wxAnimation GetAnimation() const wxOVERRIDE - { return wxAnimation(m_anim); } + void SetAnimation(const wxAnimation &anim) wxOVERRIDE; virtual bool Play() wxOVERRIDE; virtual void Stop() wxOVERRIDE; @@ -123,7 +65,10 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE; + static wxAnimation CreateCompatibleAnimation(); + protected: + virtual wxAnimationImpl* DoCreateAnimationImpl() const wxOVERRIDE; virtual void DisplayStaticImage() wxOVERRIDE; virtual wxSize DoGetBestSize() const wxOVERRIDE; @@ -133,6 +78,11 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase void ResetAnim(); void ResetIter(); + // Helpers to safely access methods in the wxAnimationGTKImpl that are + // specific to the gtk implementation + GdkPixbufAnimation *AnimationImplGetPixbuf() const; + void AnimationImplSetPixbuf(GdkPixbufAnimation* p); + protected: // internal vars GdkPixbufAnimation *m_anim; diff --git a/include/wx/gtk/private/animate.h b/include/wx/gtk/private/animate.h new file mode 100644 index 000000000000..214ae7db7ece --- /dev/null +++ b/include/wx/gtk/private/animate.h @@ -0,0 +1,69 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/gtk/private/animate.h +// Purpose: Animation classes +// Author: Julian Smart and Guillermo Rodriguez Garcia +// Modified by: Francesco Montorsi +// Created: 13/8/99 +// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_GTK_PRIVATE_ANIMATEH__ +#define _WX_GTK_PRIVATE_ANIMATEH__ + +#include "wx/private/animate.h" + +typedef struct _GdkPixbufAnimation GdkPixbufAnimation; +typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter; + +// ---------------------------------------------------------------------------- +// wxAnimationGTKImpl +// Unlike the generic wxAnimation object we won't use directly +// wxAnimationDecoders as gdk-pixbuf already provides the concept of decoder and +// will automatically use the available handlers. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxAnimationGTKImpl : public wxAnimationImpl +{ +public: + wxAnimationGTKImpl() + : m_pixbuf(NULL) {} + ~wxAnimationGTKImpl() { UnRef(); } + + virtual bool IsOk() const wxOVERRIDE + { return m_pixbuf != NULL; } + virtual bool IsCompatibleWith(wxClassInfo* ci) const wxOVERRIDE; + + + // unfortunately GdkPixbufAnimation does not expose these info: + + virtual unsigned int GetFrameCount() const wxOVERRIDE { return 0; } + virtual wxImage GetFrame(unsigned int frame) const wxOVERRIDE; + + // we can retrieve the delay for a frame only after building + // a GdkPixbufAnimationIter... + virtual int GetDelay(unsigned int WXUNUSED(frame)) const wxOVERRIDE { return 0; } + virtual wxSize GetSize() const wxOVERRIDE; + + virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; + + // Implementation +public: // used by GTK callbacks + + GdkPixbufAnimation *GetPixbuf() const + { return m_pixbuf; } + void SetPixbuf(GdkPixbufAnimation* p); + +protected: + GdkPixbufAnimation *m_pixbuf; + +private: + void UnRef(); + + typedef wxAnimationImpl base_type; + wxDECLARE_NO_COPY_CLASS(wxAnimationGTKImpl); +}; + + +#endif // _WX_GTK_PRIVATE_ANIMATEH__ diff --git a/include/wx/private/animate.h b/include/wx/private/animate.h new file mode 100644 index 000000000000..3e85dd854b89 --- /dev/null +++ b/include/wx/private/animate.h @@ -0,0 +1,44 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/private/animate.h +// Purpose: wxAnimationImpl declaration +// Author: Robin Dunn, Vadim Zeitlin +// Created: 2020-04-06 +// Copyright: (c) 2020 wxWidgets development team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_PRIVATE_ANIMATEH__ +#define _WX_PRIVATE_ANIMATEH__ + +// ---------------------------------------------------------------------------- +// wxAnimationImpl +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxAnimationImpl : public wxRefCounter +{ +public: + wxAnimationImpl() {} + virtual ~wxAnimationImpl() {} + + virtual bool IsOk() const = 0; + virtual bool IsCompatibleWith(wxClassInfo* ci) const = 0; + + // can be -1 + virtual int GetDelay(unsigned int frame) const = 0; + + virtual unsigned int GetFrameCount() const = 0; + virtual wxImage GetFrame(unsigned int frame) const = 0; + virtual wxSize GetSize() const = 0; + + virtual bool LoadFile(const wxString& name, + wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; + virtual bool Load(wxInputStream& stream, + wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; + + // This function creates the default implementation for this platform: + // currently it's wxAnimationGTKImpl under wxGTK and wxAnimationGenericImpl + // under all the other platforms. + static wxAnimationImpl *CreateDefault(); +}; + +#endif // _WX_PRIVATE_ANIMATEH__ diff --git a/interface/wx/anidecod.h b/interface/wx/anidecod.h new file mode 100644 index 000000000000..3e727a79eec7 --- /dev/null +++ b/interface/wx/anidecod.h @@ -0,0 +1,32 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/anidecod.h +// Purpose: wxANIDecoder, ANI reader for wxImage and wxAnimation +// Author: Francesco Montorsi +// Copyright: (c) 2006 Francesco Montorsi +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +/** + @class wxANIDecoder + + An animation decoder supporting animated cursor (.ani) files. +*/ +class wxANIDecoder : public wxAnimationDecoder +{ +public: + wxANIDecoder(); + ~wxANIDecoder(); + + virtual bool Load( wxInputStream& stream ); + virtual wxAnimationDecoder *Clone() const; + virtual wxAnimationType GetType() const; + virtual bool ConvertToImage(unsigned int frame, wxImage *image) const; + virtual wxSize GetFrameSize(unsigned int frame) const; + virtual wxPoint GetFramePosition(unsigned int frame) const; + virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; + virtual long GetDelay(unsigned int frame) const; + virtual wxColour GetTransparentColour(unsigned int frame) const; + +protected: + virtual bool DoCanRead(wxInputStream& stream) const; +}; diff --git a/interface/wx/animate.h b/interface/wx/animate.h index 45e5e88adb02..3233ae009941 100644 --- a/interface/wx/animate.h +++ b/interface/wx/animate.h @@ -39,6 +39,10 @@ enum wxAnimationType It is only available if @c wxUSE_ANIMATIONCTRL is set to 1 (the default). + For the platforms where this control has a native implementation, it may + have only limited support for the animation types, see @c + wxGenericAnimationCtrl if you need to support all of them. + @beginStyleTable @style{wxAC_DEFAULT_STYLE} The default style: wxBORDER_NONE. @@ -103,6 +107,28 @@ class wxAnimationCtrl : public wxControl long style = wxAC_DEFAULT_STYLE, const wxString& name = wxAnimationCtrlNameStr); + /** + Create a new animation object compatible with this control. + + A wxAnimation object created using this function is always compatible + with controls of this type, see wxAnimation::IsCompatibleWith(). + + @see CreateCompatibleAnimation() + + @since 3.1.4 + */ + wxAnimation CreateAnimation() const; + + /** + Create a new animation object compatible with this control. + + This method does the same thing as CreateAnimation() but is static, + i.e. can be called without creating any wxAnimationCtrl objects. + + @since 3.1.4 + */ + static wxAnimation CreateCompatibleAnimation(); + /** Returns the animation associated with this control. */ @@ -177,22 +203,109 @@ class wxAnimationCtrl : public wxControl }; - /** - @class wxAnimation + @class wxGenericAnimationCtrl - This class encapsulates the concept of a platform-dependent animation. - An animation is a sequence of frames of the same size. - Sound is not supported by wxAnimation. + Generic implementation of wxAnimationCtrl interface. - Note that on wxGTK wxAnimation is capable of loading the formats supported - by the internally-used @c gdk-pixbuf library (typically this means only - @c wxANIMATION_TYPE_GIF). - On other platforms wxAnimation is always capable of loading both GIF and ANI - formats (i.e. both @c wxANIMATION_TYPE_GIF and @c wxANIMATION_TYPE_ANI). + If the platform supports a native animation control (currently just wxGTK) + then this class implements the same interface internally in wxWidgets. + One advantage of using this class instead of the native version is that + this version of the control is capable of using animations in other formats + than the ones supported by the @c gdk-pixbuf library used by wxGTK, which + typically only supports @c wxANIMATION_TYPE_GIF. + + Note that to use this class you need to explicitly include the generic + header after including the main one before using it, i.e. + @code + #include + #include + @endcode @library{wxcore} @category{gdi} +*/ + +class wxGenericAnimationCtrl : public wxAnimationCtrl +{ +public: + /** + Initializes the object and calls Create() with + all the parameters. + */ + wxGenericAnimationCtrl(wxWindow* parent, wxWindowID id, + const wxAnimation& anim = wxNullAnimation, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxAC_DEFAULT_STYLE, + const wxString& name = wxAnimationCtrlNameStr); + + /** + Creates the control with the given @a anim animation. + + After control creation you must explicitly call Play() to start to play + the animation. Until that function won't be called, the first frame + of the animation is displayed. + + @param parent + Parent window, must be non-@NULL. + @param id + The identifier for the control. + @param anim + The initial animation shown in the control. + @param pos + Initial position. + @param size + Initial size. + @param style + The window style, see wxAC_* flags. + @param name + Control name. + + @return @true if the control was successfully created or @false if + creation failed. + */ + bool Create(wxWindow* parent, wxWindowID id, + const wxAnimation& anim = wxNullAnimation, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxAC_DEFAULT_STYLE, + const wxString& name = wxAnimationCtrlNameStr); + + /** + Draw the current frame of the animation into given DC. + This is fast as current frame is always cached. + */ + void DrawCurrentFrame(wxDC& dc); + + /** + Returns a wxBitmap with the current frame drawn in it. + */ + wxBitmap& GetBackingStore(); + + /** + This overload of Play() lets you specify if the animation must loop or not + */ + bool Play(bool looped); + + /** + Specify whether the animation's background colour is to be shown (the default), + or whether the window background should show through + */ + void SetUseWindowBackgroundColour(bool useWinBackground = true); + + /** + Returns @c true if the window's background colour is being used. + */ + bool IsUsingWindowBackgroundColour() const; +}; + + +/** + @class wxAnimation + + The @c wxAnimation class handles the interface between the animation + control and the details of the animation image or data. @stdobjects ::wxNullAnimation @@ -203,63 +316,90 @@ class wxAnimation : public wxObject { public: /** - Default ctor. - */ - wxAnimation(); + Constructs a new empty animation object. - /** - Copy ctor. - */ - wxAnimation(const wxAnimation& anim); + Call Load() to initialize it. + + @see wxAnimationCtrl::CreateAnimation() + */ + wxAnimation(); /** - Loads an animation from a file. + Constructs a new animation object and load the animation data from the + given filename. @param name - The name of the file to load. + A filename. @param type - See LoadFile() for more info. + One of the ::wxAnimationType values; wxANIMATION_TYPE_ANY + means that the function should try to autodetect the filetype. + + @see wxAnimationCtrl::CreateAnimation() + */ + wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY); + + /** + Copy constructor. */ - wxAnimation(const wxString& name, - wxAnimationType type = wxANIMATION_TYPE_ANY); + wxAnimation(const wxAnimation& other); /** - Destructor. - See @ref overview_refcount_destruct for more info. + Returns @true if animation data is present. */ - virtual ~wxAnimation(); + bool IsOk() const; + + /** + Returns @true if animation can be used with controls of the given type. + + This function checks if this animation object can be used with + wxAnimationCtrl of particular type. This will be always the case for + the platforms where only a single wxAnimationCtrl implementation is + available, but not necessarily under e.g. wxGTK where both native (but + limited) GTK implementation and generic implementation can be used. + + @since 3.1.4 + */ + bool IsCompatibleWith(wxClassInfo* ci) const; /** Returns the delay for the i-th frame in milliseconds. If @c -1 is returned the frame is to be displayed forever. */ - virtual int GetDelay(unsigned int i) const; + int GetDelay(unsigned int frame) const; /** - Returns the i-th frame as a wxImage. + Returns the number of frames for this animation. This method is not implemented in the native wxGTK implementation of - this class and always returns an invalid image there. + this class and always returns 0 there. */ - virtual wxImage GetFrame(unsigned int i) const; + unsigned int GetFrameCount() const; /** - Returns the number of frames for this animation. + Returns the i-th frame as a wxImage. This method is not implemented in the native wxGTK implementation of - this class and always returns 0 there. + this class and always returns an invalid image there. */ - virtual unsigned int GetFrameCount() const; + wxImage GetFrame(unsigned int frame); /** - Returns the size of the animation. + Returns the size of the animation. */ - virtual wxSize GetSize() const; + wxSize GetSize() const; /** - Returns @true if animation data is present. + Loads an animation from a file. + + @param name + A filename. + @param type + One of the ::wxAnimationType values; wxANIMATION_TYPE_ANY + means that the function should try to autodetect the filetype. + + @return @true if the operation succeeded, @false otherwise. */ - virtual bool IsOk() const; + bool LoadFile(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY); /** Loads an animation from the given stream. @@ -273,30 +413,45 @@ class wxAnimation : public wxObject @return @true if the operation succeeded, @false otherwise. */ - virtual bool Load(wxInputStream& stream, - wxAnimationType type = wxANIMATION_TYPE_ANY); + bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY); + /** - Loads an animation from a file. + Returns the list of animation decoders used by the generic animation + and @c wxGenericAnimationCtrl. + */ + static inline wxAnimationDecoderList& GetHandlers(); - @param name - A filename. - @param type - One of the ::wxAnimationType values; wxANIMATION_TYPE_ANY - means that the function should try to autodetect the filetype. + /** + Add a new decoder to the list of animation decoders. + */ + static void AddHandler(wxAnimationDecoder *handler); - @return @true if the operation succeeded, @false otherwise. - */ - virtual bool LoadFile(const wxString& name, - wxAnimationType type = wxANIMATION_TYPE_ANY); + /** + Insert a new decoder to the front of the list of animation decoders. + */ + static void InsertHandler(wxAnimationDecoder *handler); + + /** + Search for an animation decoder by type. + */ + static const wxAnimationDecoder *FindHandler( wxAnimationType animType ); /** - Assignment operator, using @ref overview_refcount "reference counting". + Load the stock animation decoders (currently GIF and ANI) into the list + of decoders. This is called automatically at program startup. */ - wxAnimation& operator =(const wxAnimation& brush); + static void InitStandardHandlers(); + + /** + Clear out the animation decoder list. This is called automatically at + program shutdown. + */ + static void CleanUpHandlers(); }; + // ============================================================================ // Global functions/macros // ============================================================================ @@ -305,4 +460,3 @@ class wxAnimation : public wxObject An empty animation object. */ wxAnimation wxNullAnimation; - diff --git a/interface/wx/animdecod.h b/interface/wx/animdecod.h new file mode 100644 index 000000000000..f5175d6e2485 --- /dev/null +++ b/interface/wx/animdecod.h @@ -0,0 +1,111 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/animdecod.h +// Purpose: wxAnimationDecoder +// Author: Francesco Montorsi +// Copyright: (c) 2006 Francesco Montorsi +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +enum wxAnimationDisposal +{ + /// No disposal specified. The decoder is not required to take any action. + wxANIM_UNSPECIFIED = -1, + + /// Do not dispose. The graphic is to be left in place. + wxANIM_DONOTREMOVE = 0, + + /// Restore to background color. The area used by the graphic must be + /// restored to the background color. + wxANIM_TOBACKGROUND = 1, + + /// Restore to previous. The decoder is required to restore the area + /// overwritten by the graphic with what was there prior to rendering the graphic. + wxANIM_TOPREVIOUS = 2 +}; + + + +/** + @class wxAnimationDecoder + + wxAnimationDecoder is used by @c wxAnimation for loading frames and other + information for the animation from the animation image file. + + */ +class wxAnimationDecoder : public wxObjectRefData +{ +public: + wxAnimationDecoder(); + + /** + Load the animation image frames from the given stream. + */ + virtual bool Load( wxInputStream& stream ) = 0; + + /** + Returns @true if this decoder supports loading from the given stream. + */ + bool CanRead( wxInputStream& stream ) const; + + /** + Create a copy of this decoder. + */ + virtual wxAnimationDecoder *Clone() const = 0; + + /** + Return the animation type this decoder implements. + */ + virtual wxAnimationType GetType() const = 0; + + /** + Convert given frame to @c wxImage. + */ + virtual bool ConvertToImage(unsigned int frame, wxImage *image) const = 0; + + + /* + Get the size of the given animation frame. + + It's possible that not all frames are of the same size; e.g. GIF allows + to specify that between two frames only a smaller portion of the entire + animation has changed. + */ + virtual wxSize GetFrameSize(unsigned int frame) const = 0; + + /* + Returns the position of the frame, in case it's not as big as the animation size, + or @c wxPoint(0,0) otherwise. + */ + virtual wxPoint GetFramePosition(unsigned int frame) const = 0; + + /** + What should be done after displaying this frame. + */ + virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const = 0; + + /** + Return the number of milliseconds this frame should be displayed. + If -1 is returned then the frame must be displayed forever. + */ + virtual long GetDelay(unsigned int frame) const = 0; + + /** + The transparent colour for this frame, if any, or @c wxNullColour. + */ + virtual wxColour GetTransparentColour(unsigned int frame) const = 0; + + wxSize GetAnimationSize() const; + wxColour GetBackgroundColour() const; + unsigned int GetFrameCount() const; + +protected: + /** + Checks the signature of the data in the given stream and returns true if it + appears to be a valid animation format recognized by the animation decoder; + this function should modify the stream current position without taking care + of restoring it since @c CanRead() will do it. + */ + virtual bool DoCanRead(wxInputStream& stream) const = 0; +}; + + diff --git a/interface/wx/gifdecod.h b/interface/wx/gifdecod.h new file mode 100644 index 000000000000..22c73c73a92f --- /dev/null +++ b/interface/wx/gifdecod.h @@ -0,0 +1,34 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/gifdecod.h +// Purpose: wxGIFDecoder, GIF reader for wxImage and wxAnimation +// Author: Guillermo Rodriguez Garcia +// Version: 3.02 +// Copyright: (c) 1999 Guillermo Rodriguez Garcia +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +/** + @class wxGIFDecoder + + An animation decoder supporting animated GIF files. +*/ +class wxGIFDecoder : public wxAnimationDecoder +{ +public: + wxGIFDecoder(); + ~wxGIFDecoder(); + + virtual bool Load( wxInputStream& stream ); + virtual wxAnimationDecoder *Clone() const; + virtual wxAnimationType GetType() const; + virtual bool ConvertToImage(unsigned int frame, wxImage *image) const; + virtual wxSize GetFrameSize(unsigned int frame) const; + virtual wxPoint GetFramePosition(unsigned int frame) const; + virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const; + virtual long GetDelay(unsigned int frame) const; + virtual wxColour GetTransparentColour(unsigned int frame) const; + +protected: + virtual bool DoCanRead(wxInputStream& stream) const; +}; + diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp index edd1f669e2e8..d10366e5949a 100644 --- a/samples/animate/anitest.cpp +++ b/samples/animate/anitest.cpp @@ -42,6 +42,9 @@ #error Cannot compile this sample if wxAnimationCtrl is not enabled #endif +#ifdef wxHAS_NATIVE_ANIMATIONCTRL + #include "wx/generic/animate.h" +#endif wxIMPLEMENT_APP(MyApp); @@ -59,7 +62,8 @@ enum ID_SET_NULL_ANIMATION, ID_SET_INACTIVE_BITMAP, ID_SET_NO_AUTO_RESIZE, - ID_SET_BGCOLOR + ID_SET_BGCOLOR, + ID_USE_GENERIC }; wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -68,6 +72,9 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_SET_INACTIVE_BITMAP, MyFrame::OnSetInactiveBitmap) EVT_MENU(ID_SET_NO_AUTO_RESIZE, MyFrame::OnSetNoAutoResize) EVT_MENU(ID_SET_BGCOLOR, MyFrame::OnSetBgColor) +#ifdef wxHAS_NATIVE_ANIMATIONCTRL + EVT_MENU(ID_USE_GENERIC, MyFrame::OnUseGeneric) +#endif // wxHAS_NATIVE_ANIMATIONCTRL EVT_MENU(wxID_STOP, MyFrame::OnStop) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) @@ -140,6 +147,12 @@ MyFrame::MyFrame(wxWindow *parent, play_menu->Append(ID_SET_BGCOLOR, "Set background colour...", "Sets the background colour of the control"); +#ifdef wxHAS_NATIVE_ANIMATIONCTRL + play_menu->AppendSeparator(); + play_menu->AppendCheckItem(ID_USE_GENERIC, "Use &generic animation\tCtrl+G", + "Selects whether native or generic version is used"); +#endif // wxHAS_NATIVE_ANIMATIONCTRL + wxMenu *help_menu = new wxMenu; help_menu->Append(wxID_ABOUT); @@ -213,25 +226,7 @@ void MyFrame::OnSetNoAutoResize(wxCommandEvent& event) if (style != m_animationCtrl->GetWindowStyle()) { - // save status of the control before destroying it - wxAnimation curr = m_animationCtrl->GetAnimation(); - wxBitmap inactive = m_animationCtrl->GetInactiveBitmap(); - wxColour bg = m_animationCtrl->GetBackgroundColour(); - - // destroy & rebuild - wxAnimationCtrl *old = m_animationCtrl; - m_animationCtrl = new wxAnimationCtrl(this, wxID_ANY, curr, - wxDefaultPosition, wxDefaultSize, - style); - - GetSizer()->Replace(old, m_animationCtrl); - delete old; - - // load old status in new control - m_animationCtrl->SetInactiveBitmap(inactive); - m_animationCtrl->SetBackgroundColour(bg); - - GetSizer()->Layout(); + RecreateAnimation(style); } } @@ -244,6 +239,58 @@ void MyFrame::OnSetBgColor(wxCommandEvent& WXUNUSED(event)) m_animationCtrl->SetBackgroundColour(clr); } +void MyFrame::RecreateAnimation(long style) +{ + // save status of the control before destroying it + + // We can't reuse the existing animation if we're switching from native to + // generic control or vice versa (as indicated by the absence of change in + // the style, which is the only other reason we can get called). We could + // save the file name we loaded it from and recreate it, of course, but for + // now, for simplicity, just start without any animation in this case. + wxAnimation curr; +#ifdef wxHAS_NATIVE_ANIMATIONCTRL + if ( style != m_animationCtrl->GetWindowStyle() ) + curr = m_animationCtrl->GetAnimation(); +#endif // wxHAS_NATIVE_ANIMATIONCTRL + + wxBitmap inactive = m_animationCtrl->GetInactiveBitmap(); + wxColour bg = m_animationCtrl->GetBackgroundColour(); + + // destroy & rebuild + wxAnimationCtrlBase *old = m_animationCtrl; + +#ifdef wxHAS_NATIVE_ANIMATIONCTRL + if ( GetMenuBar()->IsChecked(ID_USE_GENERIC) ) + m_animationCtrl = new wxGenericAnimationCtrl(this, wxID_ANY, curr, + wxDefaultPosition, + wxDefaultSize, + style); + else +#endif // wxHAS_NATIVE_ANIMATIONCTRL + m_animationCtrl = new wxAnimationCtrl(this, wxID_ANY, curr, + wxDefaultPosition, wxDefaultSize, + style); + + GetSizer()->Replace(old, m_animationCtrl); + delete old; + + // load old status in new control + m_animationCtrl->SetInactiveBitmap(inactive); + m_animationCtrl->SetBackgroundColour(bg); + + GetSizer()->Layout(); +} + +#ifdef wxHAS_NATIVE_ANIMATIONCTRL + +void MyFrame::OnUseGeneric(wxCommandEvent& WXUNUSED(event)) +{ + RecreateAnimation(m_animationCtrl->GetWindowStyle()); +} + +#endif // wxHAS_NATIVE_ANIMATIONCTRL + void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(); @@ -272,15 +319,7 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) { wxString filename(dialog.GetPath()); - // enable one of the two chunk of codes to test different parts of wxAnimation/wxAnimationCtrl -#if 0 - if (m_animationCtrl->LoadFile(filename)) - m_animationCtrl->Play(); - else - wxMessageBox("Sorry, this animation is not a valid format for wxAnimation."); -#else - #if 0 - wxAnimation temp; + wxAnimation temp(m_animationCtrl->CreateAnimation()); if (!temp.LoadFile(filename)) { wxLogError("Sorry, this animation is not a valid format for wxAnimation."); @@ -289,25 +328,6 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) m_animationCtrl->SetAnimation(temp); m_animationCtrl->Play(); - #else - wxFileInputStream stream(filename); - if (!stream.IsOk()) - { - wxLogError("Sorry, this animation is not a valid format for wxAnimation."); - return; - } - - wxAnimation temp; - if (!temp.Load(stream)) - { - wxLogError("Sorry, this animation is not a valid format for wxAnimation."); - return; - } - - m_animationCtrl->SetAnimation(temp); - m_animationCtrl->Play(); - #endif -#endif GetSizer()->Layout(); } diff --git a/samples/animate/anitest.h b/samples/animate/anitest.h index 330d10acd59c..505dfdb30567 100644 --- a/samples/animate/anitest.h +++ b/samples/animate/anitest.h @@ -36,17 +36,20 @@ class MyFrame : public wxFrame void OnSetBgColor(wxCommandEvent& event); void OnStop(wxCommandEvent& event); +#ifdef wxHAS_NATIVE_ANIMATIONCTRL + void OnUseGeneric(wxCommandEvent& event); +#endif // wxHAS_NATIVE_ANIMATIONCTRL + void OnUpdateUI(wxUpdateUIEvent& event); #if wxUSE_FILEDLG void OnOpen(wxCommandEvent& event); #endif // wxUSE_FILEDLG - wxAnimationCtrl* GetAnimationCtrl() const { return m_animationCtrl; } +private: + void RecreateAnimation(long style); -protected: - wxAnimationCtrl* m_animationCtrl; + wxAnimationCtrlBase* m_animationCtrl; -private: wxDECLARE_EVENT_TABLE(); }; diff --git a/src/common/animatecmn.cpp b/src/common/animatecmn.cpp index 17c2a60b6371..9e74a365a93b 100644 --- a/src/common/animatecmn.cpp +++ b/src/common/animatecmn.cpp @@ -28,14 +28,121 @@ #include "wx/brush.h" #include "wx/image.h" #include "wx/dcmemory.h" +#include "wx/module.h" -const char wxAnimationCtrlNameStr[] = "animationctrl"; +#include "wx/gifdecod.h" +#include "wx/anidecod.h" + +#include "wx/private/animate.h" -// global object +// global objects +const char wxAnimationCtrlNameStr[] = "animationctrl"; wxAnimation wxNullAnimation; -wxIMPLEMENT_ABSTRACT_CLASS(wxAnimationBase, wxObject); -wxIMPLEMENT_ABSTRACT_CLASS(wxAnimationCtrlBase, wxControl); +wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxObject); + +#if !defined(wxHAS_NATIVE_ANIMATIONCTRL) + // In this case the "native" ctrl is the generic ctrl. See wx/animate.h + // Notice that it's important to use wxGenericAnimationCtrl here because + // wxAnimation::IsCompatibleWith() relies on control deriving from + // wxGenericAnimationCtrl when using generic wxAnimation implementation. + wxIMPLEMENT_CLASS(wxAnimationCtrl, wxGenericAnimationCtrl); +#endif + +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxAnimationDecoderList) + +wxAnimationDecoderList wxAnimation::sm_handlers; + +// ---------------------------------------------------------------------------- +// wxAnimation +// ---------------------------------------------------------------------------- + +wxAnimation::wxAnimation() +{ + m_refData = wxAnimationImpl::CreateDefault(); +} + +wxAnimation::wxAnimation(wxAnimationImpl* impl) +{ + m_refData = impl; +} + +wxAnimation::wxAnimation(const wxString &name, wxAnimationType type) +{ + m_refData = wxAnimationImpl::CreateDefault(); + LoadFile(name, type); +} + +wxAnimation::wxAnimation(const wxAnimation& other) +{ + Ref(other); +} + +wxAnimation& wxAnimation::operator=(const wxAnimation& other) +{ + if (this != &other) + { + UnRef(); + Ref(other); + } + return *this; +} + +wxAnimationImpl* wxAnimation::GetImpl() const +{ + return static_cast(m_refData); +} + +bool wxAnimation::IsOk() const +{ + return GetImpl() && GetImpl()->IsOk(); +} + +bool wxAnimation::IsCompatibleWith(wxClassInfo* ci) const +{ + wxCHECK_MSG( IsOk(), false, wxT("invalid animation") ); + + return GetImpl()->IsCompatibleWith(ci); +} + +int wxAnimation::GetDelay(unsigned int frame) const +{ + wxCHECK_MSG( IsOk(), -1, wxT("invalid animation") ); + return GetImpl()->GetDelay(frame); +} + +unsigned int wxAnimation::GetFrameCount() const +{ + wxCHECK_MSG( IsOk(), 0, wxT("invalid animation") ); + return GetImpl()->GetFrameCount(); +} + +wxImage wxAnimation::GetFrame(unsigned int frame) +{ + wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid animation") ); + return GetImpl()->GetFrame(frame); +} + +wxSize wxAnimation::GetSize() const +{ + wxCHECK_MSG( IsOk(), wxDefaultSize, wxT("invalid animation") ); + return GetImpl()->GetSize(); +} + +bool wxAnimation::LoadFile(const wxString& name, wxAnimationType type) +{ + // the animation impl may not be fully ready until after it has loaded the + // file, so just check GetImpl in the Load methods + wxCHECK_MSG( GetImpl(), false, wxT("invalid animation") ); + return GetImpl()->LoadFile(name, type); +} + +bool wxAnimation::Load(wxInputStream& stream, wxAnimationType type) +{ + wxCHECK_MSG( GetImpl(), false, wxT("invalid animation") ); + return GetImpl()->Load(stream, type); +} // ---------------------------------------------------------------------------- @@ -103,4 +210,96 @@ void wxAnimationCtrlBase::SetInactiveBitmap(const wxBitmap &bmp) DisplayStaticImage(); } +// ---------------------------------------------------------------------------- +// animation decoders +// ---------------------------------------------------------------------------- + +void wxAnimation::AddHandler( wxAnimationDecoder *handler ) +{ + // Check for an existing handler of the type being added. + if (FindHandler( handler->GetType() ) == 0) + { + sm_handlers.Append( handler ); + } + else + { + // This is not documented behaviour, merely the simplest 'fix' + // for preventing duplicate additions. If someone ever has + // a good reason to add and remove duplicate handlers (and they + // may) we should probably refcount the duplicates. + + wxLogDebug( wxT("Adding duplicate animation handler for '%d' type"), + handler->GetType() ); + delete handler; + } +} + +void wxAnimation::InsertHandler( wxAnimationDecoder *handler ) +{ + // Check for an existing handler of the type being added. + if (FindHandler( handler->GetType() ) == 0) + { + sm_handlers.Insert( handler ); + } + else + { + // see AddHandler for additional comments. + wxLogDebug( wxT("Inserting duplicate animation handler for '%d' type"), + handler->GetType() ); + delete handler; + } +} + +const wxAnimationDecoder *wxAnimation::FindHandler( wxAnimationType animType ) +{ + wxAnimationDecoderList::compatibility_iterator node = sm_handlers.GetFirst(); + while (node) + { + const wxAnimationDecoder *handler = (const wxAnimationDecoder *)node->GetData(); + if (handler->GetType() == animType) return handler; + node = node->GetNext(); + } + return 0; +} + +void wxAnimation::InitStandardHandlers() +{ +#if wxUSE_GIF + AddHandler(new wxGIFDecoder); +#endif // wxUSE_GIF +#if wxUSE_ICO_CUR + AddHandler(new wxANIDecoder); +#endif // wxUSE_ICO_CUR +} + +void wxAnimation::CleanUpHandlers() +{ + wxAnimationDecoderList::compatibility_iterator node = sm_handlers.GetFirst(); + while (node) + { + wxAnimationDecoder *handler = (wxAnimationDecoder *)node->GetData(); + wxAnimationDecoderList::compatibility_iterator next = node->GetNext(); + delete handler; + node = next; + } + + sm_handlers.Clear(); +} + + +// A module to allow wxAnimation initialization/cleanup +// without calling these functions from app.cpp or from +// the user's application. + +class wxAnimationModule: public wxModule +{ + wxDECLARE_DYNAMIC_CLASS(wxAnimationModule); +public: + wxAnimationModule() {} + bool OnInit() wxOVERRIDE { wxAnimation::InitStandardHandlers(); return true; } + void OnExit() wxOVERRIDE { wxAnimation::CleanUpHandlers(); } +}; + +wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule); + #endif // wxUSE_ANIMATIONCTRL diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp index c27fc524a9f9..bfd826eb0446 100644 --- a/src/generic/animateg.cpp +++ b/src/generic/animateg.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: src/generic/animateg.cpp -// Purpose: wxAnimation and wxAnimationCtrl +// Purpose: wxAnimationGenericImpl and wxGenericAnimationCtrl // Author: Julian Smart and Guillermo Rodriguez Garcia // Modified by: Francesco Montorsi // Created: 13/8/99 @@ -17,99 +17,86 @@ #if wxUSE_ANIMATIONCTRL #include "wx/animate.h" +#include "wx/generic/animate.h" +#include "wx/generic/private/animate.h" #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/image.h" #include "wx/dcmemory.h" #include "wx/dcclient.h" - #include "wx/module.h" #endif #include "wx/wfstream.h" -#include "wx/gifdecod.h" -#include "wx/anidecod.h" - -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxAnimationDecoderList) - -wxAnimationDecoderList wxAnimation::sm_handlers; - // ---------------------------------------------------------------------------- // wxAnimation // ---------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxAnimationBase); -#define M_ANIMDATA static_cast(m_refData) +#ifndef wxHAS_NATIVE_ANIMATIONCTRL -wxSize wxAnimation::GetSize() const +/* static */ +wxAnimationImpl *wxAnimationImpl::CreateDefault() { - wxCHECK_MSG( IsOk(), wxDefaultSize, wxT("invalid animation") ); - - return M_ANIMDATA->GetAnimationSize(); + return new wxAnimationGenericImpl(); } -unsigned int wxAnimation::GetFrameCount() const +#endif // !wxHAS_NATIVE_ANIMATIONCTRL + +bool wxAnimationGenericImpl::IsCompatibleWith(wxClassInfo* ci) const { - wxCHECK_MSG( IsOk(), 0, wxT("invalid animation") ); + return ci->IsKindOf(&wxGenericAnimationCtrl::ms_classInfo); +} - return M_ANIMDATA->GetFrameCount(); +wxSize wxAnimationGenericImpl::GetSize() const +{ + return m_decoder->GetAnimationSize(); } -wxImage wxAnimation::GetFrame(unsigned int i) const +unsigned int wxAnimationGenericImpl::GetFrameCount() const { - wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid animation") ); + return m_decoder->GetFrameCount(); +} +wxImage wxAnimationGenericImpl::GetFrame(unsigned int i) const +{ wxImage ret; - if (!M_ANIMDATA->ConvertToImage(i, &ret)) + if (!m_decoder->ConvertToImage(i, &ret)) return wxNullImage; return ret; } -int wxAnimation::GetDelay(unsigned int i) const +int wxAnimationGenericImpl::GetDelay(unsigned int i) const { - wxCHECK_MSG( IsOk(), 0, wxT("invalid animation") ); - - return M_ANIMDATA->GetDelay(i); + return m_decoder->GetDelay(i); } -wxPoint wxAnimation::GetFramePosition(unsigned int frame) const +wxPoint wxAnimationGenericImpl::GetFramePosition(unsigned int frame) const { - wxCHECK_MSG( IsOk(), wxDefaultPosition, wxT("invalid animation") ); - - return M_ANIMDATA->GetFramePosition(frame); + return m_decoder->GetFramePosition(frame); } -wxSize wxAnimation::GetFrameSize(unsigned int frame) const +wxSize wxAnimationGenericImpl::GetFrameSize(unsigned int frame) const { - wxCHECK_MSG( IsOk(), wxDefaultSize, wxT("invalid animation") ); - - return M_ANIMDATA->GetFrameSize(frame); + return m_decoder->GetFrameSize(frame); } -wxAnimationDisposal wxAnimation::GetDisposalMethod(unsigned int frame) const +wxAnimationDisposal wxAnimationGenericImpl::GetDisposalMethod(unsigned int frame) const { - wxCHECK_MSG( IsOk(), wxANIM_UNSPECIFIED, wxT("invalid animation") ); - - return M_ANIMDATA->GetDisposalMethod(frame); + return m_decoder->GetDisposalMethod(frame); } -wxColour wxAnimation::GetTransparentColour(unsigned int frame) const +wxColour wxAnimationGenericImpl::GetTransparentColour(unsigned int frame) const { - wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid animation") ); - - return M_ANIMDATA->GetTransparentColour(frame); + return m_decoder->GetTransparentColour(frame); } -wxColour wxAnimation::GetBackgroundColour() const +wxColour wxAnimationGenericImpl::GetBackgroundColour() const { - wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid animation") ); - - return M_ANIMDATA->GetBackgroundColour(); + return m_decoder->GetBackgroundColour(); } -bool wxAnimation::LoadFile(const wxString& filename, wxAnimationType type) +bool wxAnimationGenericImpl::LoadFile(const wxString& filename, wxAnimationType type) { wxFileInputStream stream(filename); if ( !stream.IsOk() ) @@ -118,14 +105,14 @@ bool wxAnimation::LoadFile(const wxString& filename, wxAnimationType type) return Load(stream, type); } -bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) +bool wxAnimationGenericImpl::Load(wxInputStream &stream, wxAnimationType type) { UnRef(); const wxAnimationDecoder *handler; if ( type == wxANIMATION_TYPE_ANY ) { - for ( wxAnimationDecoderList::compatibility_iterator node = sm_handlers.GetFirst(); + for ( wxAnimationDecoderList::compatibility_iterator node = wxAnimation::GetHandlers().GetFirst(); node; node = node->GetNext() ) { handler=(const wxAnimationDecoder*)node->GetData(); @@ -134,8 +121,8 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) { // do a copy of the handler from the static list which we will own // as our reference data - m_refData = handler->Clone(); - return M_ANIMDATA->Load(stream); + m_decoder = handler->Clone(); + return m_decoder->Load(stream); } } @@ -143,7 +130,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) return false; } - handler = FindHandler(type); + handler = wxAnimation::FindHandler(type); if (handler == NULL) { @@ -155,123 +142,38 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) // do a copy of the handler from the static list which we will own // as our reference data - m_refData = handler->Clone(); + m_decoder = handler->Clone(); - if (stream.IsSeekable() && !M_ANIMDATA->CanRead(stream)) + if (stream.IsSeekable() && !m_decoder->CanRead(stream)) { wxLogError(_("Animation file is not of type %ld."), type); return false; } else - return M_ANIMDATA->Load(stream); -} - - -// ---------------------------------------------------------------------------- -// animation decoders -// ---------------------------------------------------------------------------- - -void wxAnimation::AddHandler( wxAnimationDecoder *handler ) -{ - // Check for an existing handler of the type being added. - if (FindHandler( handler->GetType() ) == 0) - { - sm_handlers.Append( handler ); - } - else - { - // This is not documented behaviour, merely the simplest 'fix' - // for preventing duplicate additions. If someone ever has - // a good reason to add and remove duplicate handlers (and they - // may) we should probably refcount the duplicates. - - wxLogDebug( wxT("Adding duplicate animation handler for '%d' type"), - handler->GetType() ); - delete handler; - } -} - -void wxAnimation::InsertHandler( wxAnimationDecoder *handler ) -{ - // Check for an existing handler of the type being added. - if (FindHandler( handler->GetType() ) == 0) - { - sm_handlers.Insert( handler ); - } - else - { - // see AddHandler for additional comments. - wxLogDebug( wxT("Inserting duplicate animation handler for '%d' type"), - handler->GetType() ); - delete handler; - } -} - -const wxAnimationDecoder *wxAnimation::FindHandler( wxAnimationType animType ) -{ - wxAnimationDecoderList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) - { - const wxAnimationDecoder *handler = (const wxAnimationDecoder *)node->GetData(); - if (handler->GetType() == animType) return handler; - node = node->GetNext(); - } - return 0; + return m_decoder->Load(stream); } -void wxAnimation::InitStandardHandlers() +void wxAnimationGenericImpl::UnRef() { -#if wxUSE_GIF - AddHandler(new wxGIFDecoder); -#endif // wxUSE_GIF -#if wxUSE_ICO_CUR - AddHandler(new wxANIDecoder); -#endif // wxUSE_ICO_CUR -} - -void wxAnimation::CleanUpHandlers() -{ - wxAnimationDecoderList::compatibility_iterator node = sm_handlers.GetFirst(); - while (node) + if ( m_decoder ) { - wxAnimationDecoder *handler = (wxAnimationDecoder *)node->GetData(); - wxAnimationDecoderList::compatibility_iterator next = node->GetNext(); - delete handler; - node = next; + m_decoder->DecRef(); + m_decoder = NULL; } - - sm_handlers.Clear(); } - -// A module to allow wxAnimation initialization/cleanup -// without calling these functions from app.cpp or from -// the user's application. - -class wxAnimationModule: public wxModule -{ - wxDECLARE_DYNAMIC_CLASS(wxAnimationModule); -public: - wxAnimationModule() {} - bool OnInit() wxOVERRIDE { wxAnimation::InitStandardHandlers(); return true; } - void OnExit() wxOVERRIDE { wxAnimation::CleanUpHandlers(); } -}; - -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule); - - // ---------------------------------------------------------------------------- // wxAnimationCtrl // ---------------------------------------------------------------------------- -wxIMPLEMENT_CLASS(wxAnimationCtrl, wxAnimationCtrlBase); -wxBEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase) - EVT_PAINT(wxAnimationCtrl::OnPaint) - EVT_SIZE(wxAnimationCtrl::OnSize) - EVT_TIMER(wxID_ANY, wxAnimationCtrl::OnTimer) +wxIMPLEMENT_CLASS(wxGenericAnimationCtrl, wxAnimationCtrlBase); +wxBEGIN_EVENT_TABLE(wxGenericAnimationCtrl, wxAnimationCtrlBase) + EVT_PAINT(wxGenericAnimationCtrl::OnPaint) + EVT_SIZE(wxGenericAnimationCtrl::OnSize) + EVT_TIMER(wxID_ANY, wxGenericAnimationCtrl::OnTimer) wxEND_EVENT_TABLE() -void wxAnimationCtrl::Init() +void wxGenericAnimationCtrl::Init() { m_currentFrame = 0; m_looped = false; @@ -282,7 +184,7 @@ void wxAnimationCtrl::Init() m_useWinBackgroundColour = true; } -bool wxAnimationCtrl::Create(wxWindow *parent, wxWindowID id, +bool wxGenericAnimationCtrl::Create(wxWindow *parent, wxWindowID id, const wxAnimation& animation, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { @@ -299,12 +201,13 @@ bool wxAnimationCtrl::Create(wxWindow *parent, wxWindowID id, return true; } -wxAnimationCtrl::~wxAnimationCtrl() +wxGenericAnimationCtrl::~wxGenericAnimationCtrl() { - Stop(); + if (IsPlaying()) + Stop(); } -bool wxAnimationCtrl::LoadFile(const wxString& filename, wxAnimationType type) +bool wxGenericAnimationCtrl::LoadFile(const wxString& filename, wxAnimationType type) { wxFileInputStream fis(filename); if (!fis.IsOk()) @@ -312,9 +215,9 @@ bool wxAnimationCtrl::LoadFile(const wxString& filename, wxAnimationType type) return Load(fis, type); } -bool wxAnimationCtrl::Load(wxInputStream& stream, wxAnimationType type) +bool wxGenericAnimationCtrl::Load(wxInputStream& stream, wxAnimationType type) { - wxAnimation anim; + wxAnimation anim(CreateAnimation()); if ( !anim.Load(stream, type) || !anim.IsOk() ) return false; @@ -322,7 +225,17 @@ bool wxAnimationCtrl::Load(wxInputStream& stream, wxAnimationType type) return true; } -wxSize wxAnimationCtrl::DoGetBestSize() const +wxAnimation wxGenericAnimationCtrl::CreateCompatibleAnimation() +{ + return MakeAnimFromImpl(new wxAnimationGenericImpl()); +} + +wxAnimationImpl* wxGenericAnimationCtrl::DoCreateAnimationImpl() const +{ + return new wxAnimationGenericImpl(); +} + +wxSize wxGenericAnimationCtrl::DoGetBestSize() const { if (m_animation.IsOk() && !this->HasFlag(wxAC_NO_AUTORESIZE)) return m_animation.GetSize(); @@ -330,7 +243,7 @@ wxSize wxAnimationCtrl::DoGetBestSize() const return FromDIP(wxSize(100, 100)); } -void wxAnimationCtrl::SetAnimation(const wxAnimation& animation) +void wxGenericAnimationCtrl::SetAnimation(const wxAnimation& animation) { if (IsPlaying()) Stop(); @@ -343,7 +256,10 @@ void wxAnimationCtrl::SetAnimation(const wxAnimation& animation) return; } - if (m_animation.GetBackgroundColour() == wxNullColour) + wxCHECK_RET(animation.IsCompatibleWith(GetClassInfo()), + wxT("incompatible animation") ); + + if (AnimationImplGetBackgroundColour() == wxNullColour) SetUseWindowBackgroundColour(); if (!this->HasFlag(wxAC_NO_AUTORESIZE)) FitToAnimation(); @@ -351,7 +267,7 @@ void wxAnimationCtrl::SetAnimation(const wxAnimation& animation) DisplayStaticImage(); } -void wxAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp) +void wxGenericAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp) { // if the bitmap has an associated mask, we need to set our background to // the colour of our parent otherwise when calling DrawCurrentFrame() @@ -364,12 +280,12 @@ void wxAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp) wxAnimationCtrlBase::SetInactiveBitmap(bmp); } -void wxAnimationCtrl::FitToAnimation() +void wxGenericAnimationCtrl::FitToAnimation() { SetSize(m_animation.GetSize()); } -bool wxAnimationCtrl::SetBackgroundColour(const wxColour& colour) +bool wxGenericAnimationCtrl::SetBackgroundColour(const wxColour& colour) { if ( !wxWindow::SetBackgroundColour(colour) ) return false; @@ -387,7 +303,7 @@ bool wxAnimationCtrl::SetBackgroundColour(const wxColour& colour) // wxAnimationCtrl - stop/play methods // ---------------------------------------------------------------------------- -void wxAnimationCtrl::Stop() +void wxGenericAnimationCtrl::Stop() { m_timer.Stop(); m_isPlaying = false; @@ -398,7 +314,7 @@ void wxAnimationCtrl::Stop() DisplayStaticImage(); } -bool wxAnimationCtrl::Play(bool looped) +bool wxGenericAnimationCtrl::Play(bool looped) { if (!m_animation.IsOk()) return false; @@ -434,7 +350,7 @@ bool wxAnimationCtrl::Play(bool looped) // wxAnimationCtrl - rendering methods // ---------------------------------------------------------------------------- -bool wxAnimationCtrl::RebuildBackingStoreUpToFrame(unsigned int frame) +bool wxGenericAnimationCtrl::RebuildBackingStoreUpToFrame(unsigned int frame) { // if we've not created the backing store yet or it's too // small, then recreate it @@ -459,14 +375,14 @@ bool wxAnimationCtrl::RebuildBackingStoreUpToFrame(unsigned int frame) // Draw all intermediate frames that haven't been removed from the animation for (unsigned int i = 0; i < frame; i++) { - if (m_animation.GetDisposalMethod(i) == wxANIM_DONOTREMOVE || - m_animation.GetDisposalMethod(i) == wxANIM_UNSPECIFIED) + if (AnimationImplGetDisposalMethod(i) == wxANIM_DONOTREMOVE || + AnimationImplGetDisposalMethod(i) == wxANIM_UNSPECIFIED) { DrawFrame(dc, i); } - else if (m_animation.GetDisposalMethod(i) == wxANIM_TOBACKGROUND) - DisposeToBackground(dc, m_animation.GetFramePosition(i), - m_animation.GetFrameSize(i)); + else if (AnimationImplGetDisposalMethod(i) == wxANIM_TOBACKGROUND) + DisposeToBackground(dc, AnimationImplGetFramePosition(i), + AnimationImplGetFrameSize(i)); } // finally draw this frame @@ -476,7 +392,7 @@ bool wxAnimationCtrl::RebuildBackingStoreUpToFrame(unsigned int frame) return true; } -void wxAnimationCtrl::IncrementalUpdateBackingStore() +void wxGenericAnimationCtrl::IncrementalUpdateBackingStore() { wxMemoryDC dc; dc.SelectObject(m_backingStore); @@ -494,11 +410,11 @@ void wxAnimationCtrl::IncrementalUpdateBackingStore() } else { - switch (m_animation.GetDisposalMethod(m_currentFrame-1)) + switch (AnimationImplGetDisposalMethod(m_currentFrame-1)) { case wxANIM_TOBACKGROUND: - DisposeToBackground(dc, m_animation.GetFramePosition(m_currentFrame-1), - m_animation.GetFrameSize(m_currentFrame-1)); + DisposeToBackground(dc, AnimationImplGetFramePosition(m_currentFrame-1), + AnimationImplGetFrameSize(m_currentFrame-1)); break; case wxANIM_TOPREVIOUS: @@ -528,7 +444,7 @@ void wxAnimationCtrl::IncrementalUpdateBackingStore() dc.SelectObject(wxNullBitmap); } -void wxAnimationCtrl::DisplayStaticImage() +void wxGenericAnimationCtrl::DisplayStaticImage() { wxASSERT(!IsPlaying()); @@ -563,7 +479,7 @@ void wxAnimationCtrl::DisplayStaticImage() Refresh(); } -void wxAnimationCtrl::DrawFrame(wxDC &dc, unsigned int frame) +void wxGenericAnimationCtrl::DrawFrame(wxDC &dc, unsigned int frame) { // PERFORMANCE NOTE: // this draw stuff is not as fast as possible: the wxAnimationDecoder @@ -572,11 +488,11 @@ void wxAnimationCtrl::DrawFrame(wxDC &dc, unsigned int frame) // If wxAnimationDecoder had a function to convert directly from its // internal format to a port-specific wxBitmap, it would be somewhat faster. wxBitmap bmp(m_animation.GetFrame(frame)); - dc.DrawBitmap(bmp, m_animation.GetFramePosition(frame), + dc.DrawBitmap(bmp, AnimationImplGetFramePosition(frame), true /* use mask */); } -void wxAnimationCtrl::DrawCurrentFrame(wxDC& dc) +void wxGenericAnimationCtrl::DrawCurrentFrame(wxDC& dc) { wxASSERT( m_backingStore.IsOk() ); @@ -584,7 +500,7 @@ void wxAnimationCtrl::DrawCurrentFrame(wxDC& dc) dc.DrawBitmap(m_backingStore, 0, 0, true /* use mask in case it's present */); } -void wxAnimationCtrl::DisposeToBackground() +void wxGenericAnimationCtrl::DisposeToBackground() { // clear the backing store wxMemoryDC dc; @@ -593,22 +509,22 @@ void wxAnimationCtrl::DisposeToBackground() DisposeToBackground(dc); } -void wxAnimationCtrl::DisposeToBackground(wxDC& dc) +void wxGenericAnimationCtrl::DisposeToBackground(wxDC& dc) { wxColour col = IsUsingWindowBackgroundColour() ? GetBackgroundColour() - : m_animation.GetBackgroundColour(); + : AnimationImplGetBackgroundColour(); wxBrush brush(col); dc.SetBackground(brush); dc.Clear(); } -void wxAnimationCtrl::DisposeToBackground(wxDC& dc, const wxPoint &pos, const wxSize &sz) +void wxGenericAnimationCtrl::DisposeToBackground(wxDC& dc, const wxPoint &pos, const wxSize &sz) { wxColour col = IsUsingWindowBackgroundColour() ? GetBackgroundColour() - : m_animation.GetBackgroundColour(); + : AnimationImplGetBackgroundColour(); wxBrush brush(col); dc.SetBrush(brush); // SetBrush and not SetBackground !! dc.SetPen(*wxTRANSPARENT_PEN); @@ -619,7 +535,7 @@ void wxAnimationCtrl::DisposeToBackground(wxDC& dc, const wxPoint &pos, const wx // wxAnimationCtrl - event handlers // ---------------------------------------------------------------------------- -void wxAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) +void wxGenericAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) { // VERY IMPORTANT: the wxPaintDC *must* be created in any case wxPaintDC dc(this); @@ -639,7 +555,7 @@ void wxAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) } } -void wxAnimationCtrl::OnTimer(wxTimerEvent &WXUNUSED(event)) +void wxGenericAnimationCtrl::OnTimer(wxTimerEvent &WXUNUSED(event)) { m_currentFrame++; if (m_currentFrame == m_animation.GetFrameCount()) @@ -671,7 +587,7 @@ void wxAnimationCtrl::OnTimer(wxTimerEvent &WXUNUSED(event)) m_timer.Start(delay, true); } -void wxAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event)) +void wxGenericAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event)) { // NB: resizing an animation control may take a lot of time // for big animations as the backing store must be @@ -692,5 +608,39 @@ void wxAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event)) } } -#endif // wxUSE_ANIMATIONCTRL +// ---------------------------------------------------------------------------- +// helpers to safely access wxAnimationGenericImpl methods +// ---------------------------------------------------------------------------- +#define ANIMATION (static_cast(GetAnimImpl())) + +wxPoint wxGenericAnimationCtrl::AnimationImplGetFramePosition(unsigned int frame) const +{ + wxCHECK_MSG( m_animation.IsOk(), wxDefaultPosition, wxT("invalid animation") ); + return ANIMATION->GetFramePosition(frame); +} +wxSize wxGenericAnimationCtrl::AnimationImplGetFrameSize(unsigned int frame) const +{ + wxCHECK_MSG( m_animation.IsOk(), wxDefaultSize, wxT("invalid animation") ); + return ANIMATION->GetFrameSize(frame); +} + +wxAnimationDisposal wxGenericAnimationCtrl::AnimationImplGetDisposalMethod(unsigned int frame) const +{ + wxCHECK_MSG( m_animation.IsOk(), wxANIM_UNSPECIFIED, wxT("invalid animation") ); + return ANIMATION->GetDisposalMethod(frame); +} + +wxColour wxGenericAnimationCtrl::AnimationImplGetTransparentColour(unsigned int frame) const +{ + wxCHECK_MSG( m_animation.IsOk(), wxNullColour, wxT("invalid animation") ); + return ANIMATION->GetTransparentColour(frame); +} + +wxColour wxGenericAnimationCtrl::AnimationImplGetBackgroundColour() const +{ + wxCHECK_MSG( m_animation.IsOk(), wxNullColour, wxT("invalid animation") ); + return ANIMATION->GetBackgroundColour(); +} + +#endif // wxUSE_ANIMATIONCTRL diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp index 1bf80687e101..bb52a72a5436 100644 --- a/src/gtk/animate.cpp +++ b/src/gtk/animate.cpp @@ -11,9 +11,10 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_ANIMATIONCTRL && !defined(__WXUNIVERSAL__) - +#if wxUSE_ANIMATIONCTRL #include "wx/animate.h" +#include "wx/gtk/private/animate.h" +#include "wx/generic/private/animate.h" #ifndef WX_PRECOMP #include "wx/image.h" @@ -32,12 +33,12 @@ extern "C" { static -void gdk_pixbuf_area_updated(GdkPixbufLoader *loader, - gint WXUNUSED(x), - gint WXUNUSED(y), - gint WXUNUSED(width), - gint WXUNUSED(height), - wxAnimation *anim) +void gdk_pixbuf_area_updated(GdkPixbufLoader *loader, + gint WXUNUSED(x), + gint WXUNUSED(y), + gint WXUNUSED(width), + gint WXUNUSED(height), + wxAnimationGTKImpl *anim) { if (anim && anim->GetPixbuf() == NULL) { @@ -49,47 +50,32 @@ void gdk_pixbuf_area_updated(GdkPixbufLoader *loader, } //----------------------------------------------------------------------------- -// wxAnimation +// wxAnimationGTKImpl //----------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxAnimationBase); +#ifdef wxHAS_NATIVE_ANIMATIONCTRL -wxAnimation::wxAnimation(const wxAnimation& that) - : base_type(that) +/* static */ +wxAnimationImpl *wxAnimationImpl::CreateDefault() { - m_pixbuf = that.m_pixbuf; - if (m_pixbuf) - g_object_ref(m_pixbuf); + return new wxAnimationGTKImpl(); } -wxAnimation::wxAnimation(GdkPixbufAnimation *p) -{ - m_pixbuf = p; - if ( m_pixbuf ) - g_object_ref(m_pixbuf); -} +#endif // wxHAS_NATIVE_ANIMATIONCTRL -wxAnimation& wxAnimation::operator=(const wxAnimation& that) +bool wxAnimationGTKImpl::IsCompatibleWith(wxClassInfo* ci) const { - if (this != &that) - { - base_type::operator=(that); - UnRef(); - m_pixbuf = that.m_pixbuf; - if (m_pixbuf) - g_object_ref(m_pixbuf); - } - return *this; + return ci->IsKindOf(&wxAnimationCtrl::ms_classInfo); } -bool wxAnimation::LoadFile(const wxString &name, wxAnimationType WXUNUSED(type)) +bool wxAnimationGTKImpl::LoadFile(const wxString &name, wxAnimationType WXUNUSED(type)) { UnRef(); m_pixbuf = gdk_pixbuf_animation_new_from_file(wxGTK_CONV_FN(name), NULL); return IsOk(); } -bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) +bool wxAnimationGTKImpl::Load(wxInputStream &stream, wxAnimationType type) { UnRef(); @@ -176,25 +162,25 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) return data_written; } -wxImage wxAnimation::GetFrame(unsigned int WXUNUSED(frame)) const +wxImage wxAnimationGTKImpl::GetFrame(unsigned int WXUNUSED(frame)) const { return wxNullImage; } -wxSize wxAnimation::GetSize() const +wxSize wxAnimationGTKImpl::GetSize() const { return wxSize(gdk_pixbuf_animation_get_width(m_pixbuf), gdk_pixbuf_animation_get_height(m_pixbuf)); } -void wxAnimation::UnRef() +void wxAnimationGTKImpl::UnRef() { if (m_pixbuf) g_object_unref(m_pixbuf); m_pixbuf = NULL; } -void wxAnimation::SetPixbuf(GdkPixbufAnimation* p) +void wxAnimationGTKImpl::SetPixbuf(GdkPixbufAnimation* p) { UnRef(); m_pixbuf = p; @@ -206,7 +192,8 @@ void wxAnimation::SetPixbuf(GdkPixbufAnimation* p) // wxAnimationCtrl //----------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrl, wxAnimationCtrlBase); +wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrl, wxControl); + wxBEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase) EVT_TIMER(wxID_ANY, wxAnimationCtrl::OnTimer) wxEND_EVENT_TABLE() @@ -254,6 +241,8 @@ bool wxAnimationCtrl::Create( wxWindow *parent, wxWindowID id, wxAnimationCtrl::~wxAnimationCtrl() { + if (IsPlaying()) + Stop(); ResetAnim(); ResetIter(); } @@ -268,7 +257,7 @@ bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type) bool wxAnimationCtrl::Load(wxInputStream& stream, wxAnimationType type) { - wxAnimation anim; + wxAnimation anim(CreateAnimation()); if ( !anim.Load(stream, type) || !anim.IsOk() ) return false; @@ -276,6 +265,16 @@ bool wxAnimationCtrl::Load(wxInputStream& stream, wxAnimationType type) return true; } +wxAnimation wxAnimationCtrl::CreateCompatibleAnimation() +{ + return MakeAnimFromImpl(new wxAnimationGTKImpl()); +} + +wxAnimationImpl* wxAnimationCtrl::DoCreateAnimationImpl() const +{ + return new wxAnimationGTKImpl(); +} + void wxAnimationCtrl::SetAnimation(const wxAnimation &anim) { if (IsPlaying()) @@ -284,8 +283,19 @@ void wxAnimationCtrl::SetAnimation(const wxAnimation &anim) ResetAnim(); ResetIter(); + m_animation = anim; + if (!m_animation.IsOk()) + { + m_anim = NULL; + DisplayStaticImage(); + return; + } + + wxCHECK_RET(anim.IsCompatibleWith(GetClassInfo()), + wxT("incompatible animation") ); + // copy underlying GdkPixbuf object - m_anim = anim.GetPixbuf(); + m_anim = AnimationImplGetPixbuf(); // m_anim may be null in case wxNullAnimation has been passed if (m_anim) @@ -466,4 +476,20 @@ void wxAnimationCtrl::OnTimer(wxTimerEvent& WXUNUSED(ev)) } } + +// helpers to safely access wxAnimationGTKImpl methods +#define ANIMATION (static_cast(GetAnimImpl())) + +GdkPixbufAnimation* wxAnimationCtrl::AnimationImplGetPixbuf() const +{ + wxCHECK_MSG( m_animation.IsOk(), NULL, wxT("invalid animation") ); + return ANIMATION->GetPixbuf(); +} + +void wxAnimationCtrl::AnimationImplSetPixbuf(GdkPixbufAnimation* p) +{ + wxCHECK_RET( m_animation.IsOk(), wxT("invalid animation") ); + ANIMATION->SetPixbuf(p); +} + #endif // wxUSE_ANIMATIONCTRL