diff options
| author | Tor Lillqvist <tml@iki.fi> | 1999-12-11 23:04:55 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-12-11 23:04:55 +0000 |
| commit | 9c00803e192d27f72660da07b0eeb39199d6f03f (patch) | |
| tree | e16963c7ead77dedabbc966f98371b48b3b863fa /gtk | |
| parent | d723183795d0f3df801262770f5198e5403e685f (diff) | |
| download | gtk+-9c00803e192d27f72660da07b0eeb39199d6f03f.tar.gz | |
Must mark also gdk_error_warnings and gdk_error_code as GDKVAR, as they
1999-12-11 Tor Lillqvist <tml@iki.fi>
* gdk/gdkprivate.h: Must mark also gdk_error_warnings and
gdk_error_code as GDKVAR, as they are referred outside GDK.
* gdk/win32/gdkinput-win32.c: Remove debugging leftover.
* gdk/win32/gdkwindow-win32.c (gdk_window_new): Assure title is
non-NULL.
* gtk/gtkdnd.c
* gtk/gtklayout.c
* gtk/gtkplug.c
* gtk/gtkselection.c
* gtk/gtksocket.c
* gtk/gtkwindow.c: Include x11/gdkx.h *or* win32/gdkwin32.c as
appropriate. There must be a cleaner way to handle this?
* gtk/gtkrc.c: Must include windows.h on Win32.
* gtk/testgtk.c: No need to include gdkx.h.
* gtk/makefile.cygwin: Correct invokation of genmarshal.pl.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkdnd.c | 9 | ||||
| -rw-r--r-- | gtk/gtklayout.c | 8 | ||||
| -rw-r--r-- | gtk/gtkplug.c | 9 | ||||
| -rw-r--r-- | gtk/gtkrc.c | 4 | ||||
| -rw-r--r-- | gtk/gtkselection.c | 9 | ||||
| -rw-r--r-- | gtk/gtksocket.c | 9 | ||||
| -rw-r--r-- | gtk/gtkwindow.c | 8 | ||||
| -rw-r--r-- | gtk/makefile.cygwin | 2 | ||||
| -rw-r--r-- | gtk/testgtk.c | 1 |
9 files changed, 51 insertions, 8 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 879773ae8f..635834e222 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -24,7 +24,14 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include "gdkx.h" +#include "gdkconfig.h" + +#if defined (GDK_WINDOWING_X11) +#include "x11/gdkx.h" +#elif defined (GDK_WINDOWING_WIN32) +#include "win32/gdkwin32.h" +#endif + #include "gdk/gdkkeysyms.h" #include "gtkdnd.h" diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index 72fca31af3..b98aeadf38 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -28,7 +28,13 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include "gdkx.h" +#include "gdkconfig.h" + +#if defined (GDK_WINDOWING_X11) +#include "x11/gdkx.h" +#elif defined (GDK_WINDOWING_WIN32) +#include "win32/gdkwin32.h" +#endif #include "gtklayout.h" #include "gtksignal.h" diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 5c0d022074..78737d2155 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -25,7 +25,14 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include "gdkx.h" +#include "gdkconfig.h" + +#if defined (GDK_WINDOWING_X11) +#include "x11/gdkx.h" +#elif defined (GDK_WINDOWING_WIN32) +#include "win32/gdkwin32.h" +#endif + #include "gdk/gdkkeysyms.h" #include "gtkplug.h" diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 58470d83d6..cf97c48ae8 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -26,6 +26,9 @@ #include "config.h" +#include "glib.h" +#include "gdkconfig.h" + #ifdef GDK_WINDOWING_X11 #include <X11/Xlocale.h> /* so we get the right setlocale */ #else @@ -49,6 +52,7 @@ #endif #ifdef G_OS_WIN32 +#include <windows.h> /* For GetWindowsDirectory */ #include <io.h> #endif diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 1d62d7dc7a..6f6ce8d04b 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -53,7 +53,14 @@ #include <stdarg.h> #include <string.h> -#include "gdkx.h" /* For gdk_window_lookup() */ +#include "gdk.h" + +#if defined (GDK_WINDOWING_X11) +#include "x11/gdkx.h" /* For gdk_window_lookup() */ +#elif defined (GDK_WINDOWING_WIN32) +#include "win32/gdkwin32.h" /* For gdk_window_lookup() */ +#endif + #include "gtkmain.h" #include "gtkselection.h" #include "gtksignal.h" diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index d13cd995ec..e5bdeac276 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -25,7 +25,14 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include "gdkx.h" +#include "gdkconfig.h" + +#if defined (GDK_WINDOWING_X11) +#include "x11/gdkx.h" +#elif defined (GDK_WINDOWING_WIN32) +#include "win32/gdkwin32.h" +#endif + #include "gdk/gdkkeysyms.h" #include "gtkwindow.h" #include "gtksignal.h" diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index ea08918635..3c649d08e6 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -28,7 +28,13 @@ #include <limits.h> #include "gdk/gdk.h" #include "gdk/gdkkeysyms.h" -#include "gdkx.h" /* For gdk_progclass */ + +#if defined (GDK_WINDOWING_X11) +#include "x11/gdkx.h" +#elif defined (GDK_WINDOWING_WIN32) +#include "win32/gdkwin32.h" +#endif + #include "gtkprivate.h" #include "gtkrc.h" #include "gtksignal.h" diff --git a/gtk/makefile.cygwin b/gtk/makefile.cygwin index f3ef0b2b3d..85c8c7dda1 100644 --- a/gtk/makefile.cygwin +++ b/gtk/makefile.cygwin @@ -318,7 +318,7 @@ gtktypebuiltins_evals.c: makeenums.pl gtk.defs $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) >gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl - $(PERL) genmarshal.pl + $(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc -rm gtkmarshal.c mv s-gmc gtkmarshal.c -rm gtkmarshal.h diff --git a/gtk/testgtk.c b/gtk/testgtk.c index c8bc008999..5a3d9993be 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -36,7 +36,6 @@ #include "gtk.h" #include "gdk/gdk.h" #include "gdk/gdkkeysyms.h" -#include "gdkx.h" #include "circles.xbm" |