diff --git a/src/gui/output/gdkdisplayer.cpp b/src/gui/output/gdkdisplayer.cpp index c849b6edc..bd47686b3 100644 --- a/src/gui/output/gdkdisplayer.cpp +++ b/src/gui/output/gdkdisplayer.cpp @@ -25,17 +25,9 @@ #include "gui/gtk-lumiera.hpp" #include "gui/output/gdkdisplayer.hpp" -/** The GdkDisplayer class is not supported in Gtk3. - * This is due to Gtk3 only supporting drawing with - * Cairo - */ -void -gdkdisplayer_gtk3_removal_func() -{ - FIXME("Remove: gtk3 does not support drawing with Gdk."); -} -#if 0 +#if false ///////////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display #include +#endif ///////////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display #include using std::cerr; @@ -58,7 +50,7 @@ GdkDisplayer::GdkDisplayer( Gtk::Widget *drawing_area, int width, int height ) : bool GdkDisplayer::usable() { - return true; + return false; /////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display } void @@ -74,6 +66,7 @@ GdkDisplayer::put( const void* image ) GdkWindow *window = drawingArea->get_window()->gobj(); REQUIRE(window != NULL); +#if false ///////////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display GdkGC *gc = gdk_gc_new( window ); REQUIRE(gc != NULL); @@ -89,9 +82,8 @@ GdkDisplayer::put( const void* image ) g_object_unref( scaled_image ); g_object_unref( pixbuf ); g_object_unref( gc ); +#endif ///////////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display } } // namespace output } // namespace gui - -#endif diff --git a/src/gui/output/gdkdisplayer.hpp b/src/gui/output/gdkdisplayer.hpp index f6010c77e..760bad4d1 100644 --- a/src/gui/output/gdkdisplayer.hpp +++ b/src/gui/output/gdkdisplayer.hpp @@ -33,8 +33,8 @@ #ifndef GUI_OUTPUT_GDKDISPLAYER_H #define GUI_OUTPUT_GDKDISPLAYER_H -#include "gui/output/displayer.hpp" #include "gui/gtk-base.hpp" +#include "gui/output/displayer.hpp" namespace Gtk { class Widget; @@ -46,6 +46,10 @@ namespace output { /** * GdkDisplayer is a class which is responsible for rendering a video * image via GDK. + * + * @todo the GdkDisplayer class is not supported anymore in Gtk3. + * This is due to Gtk3 only supporting drawing with Cairo + * /////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display */ class GdkDisplayer : public Displayer diff --git a/src/gui/widgets/video-display-widget.cpp b/src/gui/widgets/video-display-widget.cpp index 978054522..ce08bda01 100644 --- a/src/gui/widgets/video-display-widget.cpp +++ b/src/gui/widgets/video-display-widget.cpp @@ -78,6 +78,7 @@ namespace widgets { if (displayer == NULL) { displayer = new GdkDisplayer (drawingArea, width, height); + ///////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display } return displayer;