[Gnash-commit] gnash ./ChangeLog gui/gtk.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/10 09:25:29

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 

Log message:
        * gui/gtk.cpp: include cairo.h if RENDERER_CAIRO is defined

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.296&tr2=1.297&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gtk.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.296 gnash/ChangeLog:1.297
--- gnash/ChangeLog:1.296       Wed May 10 09:21:30 2006
+++ gnash/ChangeLog     Wed May 10 09:25:28 2006
@@ -1,5 +1,6 @@
 2006-05-10 Sandro Santilli <address@hidden>
 
+       * gui/gtk.cpp: include cairo.h if RENDERER_CAIRO is defined
        * gui/gtksup.h: include cairo.h if RENDERER_CAIRO is defined
        * macros/cairo.m4: search cairo dev files even if plugin is disabled
        * macros/gtk2.m4: fixed handling of --with-gtk2-lib
Index: gnash/gui/gtk.cpp
diff -u gnash/gui/gtk.cpp:1.4 gnash/gui/gtk.cpp:1.5
--- gnash/gui/gtk.cpp:1.4       Wed May 10 01:45:50 2006
+++ gnash/gui/gtk.cpp   Wed May 10 09:25:28 2006
@@ -40,26 +40,26 @@
 #include "config.h"
 #endif
 
-#include <iostream>
-#include <X11/keysym.h>
-
-#ifdef RENDERER_OPENGL
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif // RENDERER_OPENGL
-
 #include "gnash.h"
 #include "movie_definition.h" 
 #include "log.h"
 
+#include "gui.h"
+#include "gtksup.h"
+
+#include <iostream>
+#include <X11/keysym.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#ifdef RENDERER_OPENGL
-#include <gtk/gtkgl.h>
-#endif // RENDERER_OPENGL
 
-#include "gui.h"
-#include "gtksup.h"
+#ifdef RENDERER_OPENGL
+# include <gtk/gtkgl.h>
+# include <GL/gl.h>
+# include <GL/glu.h>
+#elif defined(RENDERER_CAIRO)
+# include <cairo.h>
+#endif