diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-01-28 11:13:06 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-01-28 17:06:06 +0100 |
| commit | c7f0cffd8a623cee9e057f99b6478ca7d9a30c3a (patch) | |
| tree | 0b8b03acb6fe5f2468dcf91fee2c74fe1bea98f9 /gtk/gtksocket.c | |
| parent | 50e1589a191f767da5a90520dfdd72f04a5f45f9 (diff) | |
| download | gtk+-c7f0cffd8a623cee9e057f99b6478ca7d9a30c3a.tar.gz | |
plug/socket: Remove x11 checks and non-x11 code
Diffstat (limited to 'gtk/gtksocket.c')
| -rw-r--r-- | gtk/gtksocket.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 263972de7e..da2ae7411e 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -43,9 +43,7 @@ #include "gtkintl.h" #include "gtkwidgetprivate.h" -#ifdef GDK_WINDOWING_X11 -#include "x11/gdkx.h" -#endif +#include <gdk/gdkx.h> /** @@ -873,11 +871,9 @@ _gtk_socket_add_window (GtkSocket *socket, gpointer user_data = NULL; GtkSocketPrivate *private = socket->priv; -#ifdef GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (display)) private->plug_window = gdk_x11_window_lookup_for_display (display, xid); else -#endif private->plug_window = NULL; if (private->plug_window) @@ -910,10 +906,8 @@ _gtk_socket_add_window (GtkSocket *socket, if (!private->plug_window) { -#ifdef GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (display)) private->plug_window = gdk_x11_window_foreign_new_for_display (display, xid); -#endif if (!private->plug_window) /* was deleted before we could get it */ { gdk_error_trap_pop_ignored (); |