From 5f8047a69b6396744c726ae52a388d898eab27d9 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 18 Oct 2006 03:32:52 +0000 Subject: [PATCH] use generic wxAnimationCtrl in wxGTK-universal git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 20 ++++++++++++++++++++ build/bakefiles/files.bkl | 2 ++ include/wx/animate.h | 2 +- src/generic/animateg.cpp | 2 +- src/gtk/animate.cpp | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index b81fcd18b1..418a20ecf6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2589,6 +2589,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR = \ wx/unix/joystick.h \ wx/unix/sound.h \ wx/unix/taskbarx11.h \ + wx/generic/animate.h \ wx/gtk/animate.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR) COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR = \ @@ -10678,6 +10679,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_joystick.o \ monodll_sound.o \ monodll_taskbarx11.o \ + monodll_animateg.o \ monodll_aboutdlg.o \ monodll_animate.o \ monodll_taskbar.o \ @@ -10747,6 +10749,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \ monolib_joystick.o \ monolib_sound.o \ monolib_taskbarx11.o \ + monolib_animateg.o \ monolib_aboutdlg.o \ monolib_animate.o \ monolib_taskbar.o \ @@ -10819,6 +10822,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \ advdll_joystick.o \ advdll_sound.o \ advdll_taskbarx11.o \ + advdll_animateg.o \ advdll_aboutdlg.o \ advdll_animate.o \ advdll_taskbar.o \ @@ -10885,6 +10889,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \ advlib_joystick.o \ advlib_sound.o \ advlib_taskbarx11.o \ + advlib_animateg.o \ advlib_aboutdlg.o \ advlib_animate.o \ advlib_taskbar.o \ @@ -15915,6 +15920,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp @@ -19953,6 +19961,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp @@ -27246,6 +27257,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MOTIF@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp @@ -27465,6 +27479,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MOTIF@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp @@ -28890,6 +28907,9 @@ SAMPLES_DIST: ALL_GUI_DIST done # copy the rest, not covered by the above loop + $(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/hourglass.ani + $(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate + $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 8ab6adb307..6433a124ac 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2759,6 +2759,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! + src/generic/animateg.cpp src/gtk/aboutdlg.cpp src/gtk/animate.cpp src/gtk/taskbar.cpp @@ -2766,6 +2767,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/eggtrayicon.c + wx/generic/animate.h wx/gtk/animate.h diff --git a/include/wx/animate.h b/include/wx/animate.h index d40361a958..1e0d6fc039 100644 --- a/include/wx/animate.h +++ b/include/wx/animate.h @@ -91,7 +91,7 @@ private: // include the platform-specific version of the wxAnimationCtrl class // ---------------------------------------------------------------------------- -#if defined(__WXGTK20__) +#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/animate.h" #else #include "wx/generic/animate.h" diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp index 7c156123b4..1bda586467 100644 --- a/src/generic/animateg.cpp +++ b/src/generic/animateg.cpp @@ -15,7 +15,7 @@ #pragma hdrstop #endif //__BORLANDC__ -#if wxUSE_ANIMATIONCTRL +#if wxUSE_ANIMATIONCTRL && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__)) #include "wx/animate.h" diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp index cf7fa686a3..cb596e7bd5 100644 --- a/src/gtk/animate.cpp +++ b/src/gtk/animate.cpp @@ -12,7 +12,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_ANIMATIONCTRL +#if wxUSE_ANIMATIONCTRL && !defined(__WXUNIVERSAL__) #include "wx/animate.h" -- 2.45.2