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

Seal GtkSocket

Browse Source 
svn path=/trunk/; revision=20604
This commit is contained in:
Tim Janik 2008-06-20 11:08:13 +00:00
parent c9b24c8817
commit f40470a362
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtk.symbols
View File

@ -3450,6 +3450,7 @@ gtk_show_uri
#if IN_FILE(__GTK_SOCKET_C__) #if IN_FILE(__GTK_SOCKET_C__)
gtk_socket_add_id gtk_socket_add_id
gtk_socket_get_id gtk_socket_get_id
gtk_socket_get_plug_window
gtk_socket_get_type G_GNUC_CONST gtk_socket_get_type G_GNUC_CONST
gtk_socket_new gtk_socket_new
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED

19
gtk/gtksocket.c
View File

@ -300,6 +300,25 @@ gtk_socket_get_id (GtkSocket *socket)
return _gtk_socket_windowing_get_id (socket); return _gtk_socket_windowing_get_id (socket);
} }
/**
* gtk_socket_get_plug_window:
* @socket_: a #GtkSocket.
*
* Retrieves the window of the plug. Use this to check if the plug has
* been created inside of the socket.
*
* Return value: the window of the plug if available, or %NULL
*
* Since: GSEAL-branch
**/
GdkWindow*
gtk_socket_get_plug_window (GtkSocket *socket)
{
g_return_val_if_fail (GTK_IS_SOCKET (socket), NULL);
return socket->plug_window;
}
static void static void
gtk_socket_realize (GtkWidget *widget) gtk_socket_realize (GtkWidget *widget)
{ {

31
gtk/gtksocket.h
View File

@ -49,24 +49,24 @@ struct _GtkSocket
{ {
GtkContainer container; GtkContainer container;
guint16 request_width; guint16 GSEAL (request_width);
guint16 request_height; guint16 GSEAL (request_height);
guint16 current_width; guint16 GSEAL (current_width);
guint16 current_height; guint16 GSEAL (current_height);
GdkWindow *plug_window; GdkWindow *GSEAL (plug_window);
GtkWidget *plug_widget; GtkWidget *GSEAL (plug_widget);
gshort xembed_version; /* -1 == not xembed */ gshort GSEAL (xembed_version); /* -1 == not xembed */
guint same_app : 1; guint GSEAL (same_app : 1);
guint focus_in : 1; guint GSEAL (focus_in : 1);
guint have_size : 1; guint GSEAL (have_size : 1);
guint need_map : 1; guint GSEAL (need_map : 1);
guint is_mapped : 1; guint GSEAL (is_mapped : 1);
guint active : 1; guint GSEAL (active : 1);
GtkAccelGroup *accel_group; GtkAccelGroup *GSEAL (accel_group);
GtkWidget *toplevel; GtkWidget *GSEAL (toplevel);
}; };
struct _GtkSocketClass struct _GtkSocketClass
@ -90,6 +90,7 @@ GtkWidget* gtk_socket_new (void);
void gtk_socket_add_id (GtkSocket *socket_, void gtk_socket_add_id (GtkSocket *socket_,
GdkNativeWindow window_id); GdkNativeWindow window_id);
GdkNativeWindow gtk_socket_get_id (GtkSocket *socket_); GdkNativeWindow gtk_socket_get_id (GtkSocket *socket_);
GdkWindow* gtk_socket_get_plug_window (GtkSocket *socket_);
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED
void gtk_socket_steal (GtkSocket *socket_, void gtk_socket_steal (GtkSocket *socket_,