callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug/socket: Remove x11 checks and non-x11 code

Browse Source
This commit is contained in:
Benjamin Otte
2011-01-28 11:13:06 +01:00
parent 50e1589a19
commit c7f0cffd8a
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkplug.c
View File

@ -37,12 +37,7 @@
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkwindowprivate.h" #include "gtkwindowprivate.h"
#ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h>
#include "x11/gdkx.h"
#endif
#ifdef GDK_WINDOWING_WIN32
#include "win32/gdkwin32.h"
#endif
/** /**
* SECTION:gtkplug * SECTION:gtkplug
@ -527,11 +522,9 @@ gtk_plug_construct_for_display (GtkPlug *plug,
{ {
gpointer user_data = NULL; gpointer user_data = NULL;
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display)) if (GDK_IS_X11_DISPLAY (display))
priv->socket_window = gdk_x11_window_lookup_for_display (display, socket_id); priv->socket_window = gdk_x11_window_lookup_for_display (display, socket_id);
else else
#endif
priv->socket_window = NULL; priv->socket_window = NULL;
if (priv->socket_window) if (priv->socket_window)
@ -551,15 +544,8 @@ gtk_plug_construct_for_display (GtkPlug *plug,
else else
g_object_ref (priv->socket_window); g_object_ref (priv->socket_window);
} }
else else if (GDK_IS_X11_DISPLAY (display))
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display))
priv->socket_window = gdk_x11_window_foreign_new_for_display (display, socket_id); priv->socket_window = gdk_x11_window_foreign_new_for_display (display, socket_id);
#endif
#ifdef GDK_WINDOWING_WIN32
if (GDK_IS_WIN32_DISPLAY (display))
priv->socket_window = gdk_win32_window_foreign_new_for_display (display, socket_id);
#endif
if (priv->socket_window) { if (priv->socket_window) {
g_signal_emit (plug, plug_signals[EMBEDDED], 0); g_signal_emit (plug, plug_signals[EMBEDDED], 0);

8
gtk/gtksocket.c
View File

@ -43,9 +43,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h>
#include "x11/gdkx.h"
#endif
/** /**
@ -873,11 +871,9 @@ _gtk_socket_add_window (GtkSocket *socket,
gpointer user_data = NULL; gpointer user_data = NULL;
GtkSocketPrivate *private = socket->priv; GtkSocketPrivate *private = socket->priv;
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display)) if (GDK_IS_X11_DISPLAY (display))
private->plug_window = gdk_x11_window_lookup_for_display (display, xid); private->plug_window = gdk_x11_window_lookup_for_display (display, xid);
else else
#endif
private->plug_window = NULL; private->plug_window = NULL;
if (private->plug_window) if (private->plug_window)
@ -910,10 +906,8 @@ _gtk_socket_add_window (GtkSocket *socket,
if (!private->plug_window) if (!private->plug_window)
{ {
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display)) if (GDK_IS_X11_DISPLAY (display))
private->plug_window = gdk_x11_window_foreign_new_for_display (display, xid); private->plug_window = gdk_x11_window_foreign_new_for_display (display, xid);
#endif
if (!private->plug_window) /* was deleted before we could get it */ if (!private->plug_window) /* was deleted before we could get it */
{ {
gdk_error_trap_pop_ignored (); gdk_error_trap_pop_ignored ();