diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-01-28 15:20:54 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-01-28 17:06:07 +0100 |
| commit | ad1f9cc0c62b574489e3ed5b3e6becec6ce72029 (patch) | |
| tree | 27dff34ed1e17df9ecd5a4e85c6858e1c185f751 | |
| parent | 1b18916a7472766d46f799d63ff52ff3c4e94165 (diff) | |
| download | gtk+-ad1f9cc0c62b574489e3ed5b3e6becec6ce72029.tar.gz | |
socket: Use Window instead of GdkNativeWindow
| -rw-r--r-- | gtk/gtksocket.c | 12 | ||||
| -rw-r--r-- | gtk/gtksocket.h | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 3550f18caf..8b92a23dc7 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -149,7 +149,7 @@ static void gtk_socket_forall (GtkContainer *container, GtkCallback callback, gpointer callback_data); static void gtk_socket_add_window (GtkSocket *socket, - GdkNativeWindow xid, + Window xid, gboolean need_reparent); static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, @@ -307,7 +307,7 @@ gtk_socket_new (void) /** * gtk_socket_add_id: * @socket_: a #GtkSocket - * @window_id: the window ID of a client participating in the XEMBED protocol. + * @window: the Window of a client participating in the XEMBED protocol. * * Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket. The * client may be in the same process or in a different process. @@ -324,7 +324,7 @@ gtk_socket_new (void) **/ void gtk_socket_add_id (GtkSocket *socket, - GdkNativeWindow window_id) + Window window) { g_return_if_fail (GTK_IS_SOCKET (socket)); g_return_if_fail (_gtk_widget_get_anchored (GTK_WIDGET (socket))); @@ -332,7 +332,7 @@ gtk_socket_add_id (GtkSocket *socket, if (!gtk_widget_get_realized (GTK_WIDGET (socket))) gtk_widget_realize (GTK_WIDGET (socket)); - gtk_socket_add_window (socket, window_id, TRUE); + gtk_socket_add_window (socket, window, TRUE); } /** @@ -348,7 +348,7 @@ gtk_socket_add_id (GtkSocket *socket, * * Return value: the window ID for the socket **/ -GdkNativeWindow +Window gtk_socket_get_id (GtkSocket *socket) { g_return_val_if_fail (GTK_IS_SOCKET (socket), 0); @@ -1027,7 +1027,7 @@ gtk_socket_forall (GtkContainer *container, */ static void gtk_socket_add_window (GtkSocket *socket, - GdkNativeWindow xid, + Window xid, gboolean need_reparent) { GtkWidget *widget = GTK_WIDGET (socket); diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index c823d50887..c5be024abf 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -34,6 +34,7 @@ #ifdef GDK_WINDOWING_X11 +#include <gdk/gdkx.h> #include <gtk/gtkcontainer.h> G_BEGIN_DECLS @@ -76,8 +77,8 @@ GType gtk_socket_get_type (void) G_GNUC_CONST; GtkWidget* gtk_socket_new (void); void gtk_socket_add_id (GtkSocket *socket_, - GdkNativeWindow window_id); -GdkNativeWindow gtk_socket_get_id (GtkSocket *socket_); + Window window); +Window gtk_socket_get_id (GtkSocket *socket_); GdkWindow* gtk_socket_get_plug_window (GtkSocket *socket_); G_END_DECLS |