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/gtksocket.c | |
| 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/gtksocket.c')
| -rw-r--r-- | gtk/gtksocket.c | 9 |
1 files changed, 8 insertions, 1 deletions
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" |