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

plug: Use Window instead of GdkNativeWindow

Browse Source
This commit is contained in:
Benjamin Otte
2011-01-28 15:34:28 +01:00
parent ad1f9cc0c6
commit 4aa67439f3
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkplug.c
View File

@ -346,7 +346,7 @@ gtk_plug_set_is_child (GtkPlug *plug,
* *
* Return value: the window ID for the plug * Return value: the window ID for the plug
**/ **/
GdkNativeWindow Window
gtk_plug_get_id (GtkPlug *plug) gtk_plug_get_id (GtkPlug *plug)
{ {
g_return_val_if_fail (GTK_IS_PLUG (plug), 0); g_return_val_if_fail (GTK_IS_PLUG (plug), 0);
@ -548,7 +548,7 @@ _gtk_plug_remove_from_socket (GtkPlug *plug,
**/ **/
void void
gtk_plug_construct (GtkPlug *plug, gtk_plug_construct (GtkPlug *plug,
GdkNativeWindow socket_id) Window socket_id)
{ {
gtk_plug_construct_for_display (plug, gdk_display_get_default (), socket_id); gtk_plug_construct_for_display (plug, gdk_display_get_default (), socket_id);
} }
@ -569,7 +569,7 @@ gtk_plug_construct (GtkPlug *plug,
void void
gtk_plug_construct_for_display (GtkPlug *plug, gtk_plug_construct_for_display (GtkPlug *plug,
GdkDisplay *display, GdkDisplay *display,
GdkNativeWindow socket_id) Window socket_id)
{ {
GtkPlugPrivate *priv; GtkPlugPrivate *priv;
@ -626,7 +626,7 @@ gtk_plug_construct_for_display (GtkPlug *plug,
* Return value: the new #GtkPlug widget. * Return value: the new #GtkPlug widget.
**/ **/
GtkWidget* GtkWidget*
gtk_plug_new (GdkNativeWindow socket_id) gtk_plug_new (Window socket_id)
{ {
return gtk_plug_new_for_display (gdk_display_get_default (), socket_id); return gtk_plug_new_for_display (gdk_display_get_default (), socket_id);
} }
@ -644,7 +644,7 @@ gtk_plug_new (GdkNativeWindow socket_id)
*/ */
GtkWidget* GtkWidget*
gtk_plug_new_for_display (GdkDisplay *display, gtk_plug_new_for_display (GdkDisplay *display,
GdkNativeWindow socket_id) Window socket_id)
{ {
GtkPlug *plug; GtkPlug *plug;

11
gtk/gtkplug.h
View File

@ -34,6 +34,7 @@
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#include <gtk/gtksocket.h> #include <gtk/gtksocket.h>
#include <gtk/gtkwindow.h> #include <gtk/gtkwindow.h>
@ -79,17 +80,17 @@ GType gtk_plug_get_type (void) G_GNUC_CONST;
#ifndef GDK_MULTIHEAD_SAFE #ifndef GDK_MULTIHEAD_SAFE
void gtk_plug_construct (GtkPlug *plug, void gtk_plug_construct (GtkPlug *plug,
GdkNativeWindow socket_id); Window socket_id);
GtkWidget* gtk_plug_new (GdkNativeWindow socket_id); GtkWidget* gtk_plug_new (Window socket_id);
#endif #endif
void gtk_plug_construct_for_display (GtkPlug *plug, void gtk_plug_construct_for_display (GtkPlug *plug,
GdkDisplay *display, GdkDisplay *display,
GdkNativeWindow socket_id); Window socket_id);
GtkWidget* gtk_plug_new_for_display (GdkDisplay *display, GtkWidget* gtk_plug_new_for_display (GdkDisplay *display,
GdkNativeWindow socket_id); Window socket_id);
GdkNativeWindow gtk_plug_get_id (GtkPlug *plug); Window gtk_plug_get_id (GtkPlug *plug);
gboolean gtk_plug_get_embedded (GtkPlug *plug); gboolean gtk_plug_get_embedded (GtkPlug *plug);