AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkplug.c
View File

@ -346,7 +346,7 @@ gtk_plug_set_is_child (GtkPlug *plug,
*
* Return value: the window ID for the plug
**/
GdkNativeWindow
Window
gtk_plug_get_id (GtkPlug *plug)
{
g_return_val_if_fail (GTK_IS_PLUG (plug), 0);
@ -547,8 +547,8 @@ _gtk_plug_remove_from_socket (GtkPlug *plug,
* @socket_id. This function will generally only be used by classes deriving from #GtkPlug.
**/
void
gtk_plug_construct (GtkPlug *plug,
GdkNativeWindow socket_id)
gtk_plug_construct (GtkPlug *plug,
Window socket_id)
{
gtk_plug_construct_for_display (plug, gdk_display_get_default (), socket_id);
}
@ -567,9 +567,9 @@ gtk_plug_construct (GtkPlug *plug,
* Since: 2.2
**/
void
gtk_plug_construct_for_display (GtkPlug *plug,
GdkDisplay *display,
GdkNativeWindow socket_id)
gtk_plug_construct_for_display (GtkPlug *plug,
GdkDisplay *display,
Window socket_id)
{
GtkPlugPrivate *priv;
@ -626,7 +626,7 @@ gtk_plug_construct_for_display (GtkPlug *plug,
* Return value: the new #GtkPlug widget.
**/
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);
}
@ -643,8 +643,8 @@ gtk_plug_new (GdkNativeWindow socket_id)
* Since: 2.2
*/
GtkWidget*
gtk_plug_new_for_display (GdkDisplay *display,
GdkNativeWindow socket_id)
gtk_plug_new_for_display (GdkDisplay *display,
Window socket_id)
{
GtkPlug *plug;

13
gtk/gtkplug.h
View File

@ -34,6 +34,7 @@
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#include <gtk/gtksocket.h>
#include <gtk/gtkwindow.h>
@ -78,18 +79,18 @@ struct _GtkPlugClass
GType gtk_plug_get_type (void) G_GNUC_CONST;
#ifndef GDK_MULTIHEAD_SAFE
void gtk_plug_construct (GtkPlug *plug,
GdkNativeWindow socket_id);
GtkWidget* gtk_plug_new (GdkNativeWindow socket_id);
void gtk_plug_construct (GtkPlug *plug,
Window socket_id);
GtkWidget* gtk_plug_new (Window socket_id);
#endif
void gtk_plug_construct_for_display (GtkPlug *plug,
GdkDisplay *display,
GdkNativeWindow socket_id);
Window socket_id);
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);