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

socket: Use Window instead of GdkNativeWindow

Browse Source
This commit is contained in:
Benjamin Otte 2011-01-28 15:20:54 +01:00
parent 1b18916a74
commit ad1f9cc0c6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtksocket.c
View File

@ -149,7 +149,7 @@ static void gtk_socket_forall (GtkContainer *container,
GtkCallback callback, GtkCallback callback,
gpointer callback_data); gpointer callback_data);
static void gtk_socket_add_window (GtkSocket *socket, static void gtk_socket_add_window (GtkSocket *socket,
GdkNativeWindow xid, Window xid,
gboolean need_reparent); gboolean need_reparent);
static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent, static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent,
GdkEvent *event, GdkEvent *event,
@ -307,7 +307,7 @@ gtk_socket_new (void)
/** /**
* gtk_socket_add_id: * gtk_socket_add_id:
* @socket_: a #GtkSocket * @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 * Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket. The
* client may be in the same process or in a different process. * client may be in the same process or in a different process.
@ -324,7 +324,7 @@ gtk_socket_new (void)
**/ **/
void void
gtk_socket_add_id (GtkSocket *socket, gtk_socket_add_id (GtkSocket *socket,
GdkNativeWindow window_id) Window window)
{ {
g_return_if_fail (GTK_IS_SOCKET (socket)); g_return_if_fail (GTK_IS_SOCKET (socket));
g_return_if_fail (_gtk_widget_get_anchored (GTK_WIDGET (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))) if (!gtk_widget_get_realized (GTK_WIDGET (socket)))
gtk_widget_realize (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 * Return value: the window ID for the socket
**/ **/
GdkNativeWindow Window
gtk_socket_get_id (GtkSocket *socket) gtk_socket_get_id (GtkSocket *socket)
{ {
g_return_val_if_fail (GTK_IS_SOCKET (socket), 0); g_return_val_if_fail (GTK_IS_SOCKET (socket), 0);
@ -1027,7 +1027,7 @@ gtk_socket_forall (GtkContainer *container,
*/ */
static void static void
gtk_socket_add_window (GtkSocket *socket, gtk_socket_add_window (GtkSocket *socket,
GdkNativeWindow xid, Window xid,
gboolean need_reparent) gboolean need_reparent)
{ {
GtkWidget *widget = GTK_WIDGET (socket); GtkWidget *widget = GTK_WIDGET (socket);

5
gtk/gtksocket.h
View File

@ -34,6 +34,7 @@
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#include <gtk/gtkcontainer.h> #include <gtk/gtkcontainer.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -76,8 +77,8 @@ GType gtk_socket_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_socket_new (void); GtkWidget* gtk_socket_new (void);
void gtk_socket_add_id (GtkSocket *socket_, void gtk_socket_add_id (GtkSocket *socket_,
GdkNativeWindow window_id); Window window);
GdkNativeWindow gtk_socket_get_id (GtkSocket *socket_); Window gtk_socket_get_id (GtkSocket *socket_);
GdkWindow* gtk_socket_get_plug_window (GtkSocket *socket_); GdkWindow* gtk_socket_get_plug_window (GtkSocket *socket_);
G_END_DECLS G_END_DECLS