[Gnash-commit] gnash/gui gtk_cairo_create.h gtk_glue.h gtk_glu...

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/22 02:27:56

Modified files:
        gui            : gtk_cairo_create.h gtk_glue.h gtk_glue_cairo.h 
                         gtk_glue_gtkglext.h gtksup.h 

Log message:
        gdk/gdkx.h is for X11.  Win32 only has gdk/gdk.h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_cairo_create.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_cairo.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_gtkglext.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.67&r2=1.68

Patches:
Index: gtk_cairo_create.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_cairo_create.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtk_cairo_create.h  10 May 2006 21:21:16 -0000      1.1
+++ gtk_cairo_create.h  22 Mar 2008 02:27:56 -0000      1.2
@@ -21,7 +21,11 @@
 
 #include <cairo-xlib.h>
 #include <gtk/gtk.h>
+#ifndef _WIN32
 #include <gdk/gdkx.h>
+#else
+#include <gdk/gdk.h>
+#endif
 
 
 /* copied from gtk+/gdk/gdkcairo.c and gtk+/gdk/x11/gdkdrawable-x11.c

Index: gtk_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtk_glue.h  21 Jan 2008 20:55:42 -0000      1.14
+++ gtk_glue.h  22 Mar 2008 02:27:56 -0000      1.15
@@ -21,7 +21,11 @@
 #include "gnash.h"
 
 #include <gtk/gtk.h>
+#ifndef _WIN32
 #include <gdk/gdkx.h>
+#else
+#include <gdk/gdk.h>
+#endif
 
 namespace gnash
 {

Index: gtk_glue_cairo.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_cairo.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gtk_glue_cairo.h    13 Mar 2008 06:43:55 -0000      1.15
+++ gtk_glue_cairo.h    22 Mar 2008 02:27:56 -0000      1.16
@@ -18,7 +18,11 @@
 #include "gtk_glue.h"
 
 #include <gtk/gtk.h>
+#ifndef _WIN32
 #include <gdk/gdkx.h>
+#else
+#include <gdk/gdk.h>
+#endif
 
 # include <cairo.h>
 

Index: gtk_glue_gtkglext.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_gtkglext.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtk_glue_gtkglext.h 21 Jan 2008 20:55:42 -0000      1.12
+++ gtk_glue_gtkglext.h 22 Mar 2008 02:27:56 -0000      1.13
@@ -18,7 +18,11 @@
 #include "gtk_glue.h"
 
 #include <gtk/gtk.h>
+#ifndef _WIN32
 #include <gdk/gdkx.h>
+#else
+#include <gdk/gdk.h>
+#endif
 
 #include <gtk/gtkgl.h>
 

Index: gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- gtksup.h    11 Mar 2008 16:58:23 -0000      1.67
+++ gtksup.h    22 Mar 2008 02:27:56 -0000      1.68
@@ -26,7 +26,11 @@
 #include "tu_config.h" // for DSOEXPORT
 #include "gtk_glue.h"
 
+#ifndef _WIN32
 #include <gdk/gdkx.h>
+#else
+#include <gdk/gdk.h>
+#endif
 #include <gtk/gtk.h>
 
 #ifdef GUI_HILDON