gtk+ r20604 - trunk/gtk

[timj svn gnome org]

Author: timj
Date: Fri Jun 20 11:08:13 2008
New Revision: 20604
URL: http://svn.gnome.org/viewvc/gtk+?rev=20604&view=rev

Log:
Seal GtkSocket


Modified:
   trunk/gtk/gtk.symbols
   trunk/gtk/gtksocket.c
   trunk/gtk/gtksocket.h

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Fri Jun 20 11:08:13 2008
@@ -3450,6 +3450,7 @@
 #if IN_FILE(__GTK_SOCKET_C__)
 gtk_socket_add_id
 gtk_socket_get_id
+gtk_socket_get_plug_window
 gtk_socket_get_type G_GNUC_CONST
 gtk_socket_new
 #ifndef GTK_DISABLE_DEPRECATED

Modified: trunk/gtk/gtksocket.c
==============================================================================
--- trunk/gtk/gtksocket.c	(original)
+++ trunk/gtk/gtksocket.c	Fri Jun 20 11:08:13 2008
@@ -300,6 +300,25 @@
   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
 gtk_socket_realize (GtkWidget *widget)
 {

Modified: trunk/gtk/gtksocket.h
==============================================================================
--- trunk/gtk/gtksocket.h	(original)
+++ trunk/gtk/gtksocket.h	Fri Jun 20 11:08:13 2008
@@ -49,24 +49,24 @@
 {
   GtkContainer container;
 
-  guint16 request_width;
-  guint16 request_height;
-  guint16 current_width;
-  guint16 current_height;
-
-  GdkWindow *plug_window;
-  GtkWidget *plug_widget;
-
-  gshort xembed_version;	/* -1 == not xembed */
-  guint same_app : 1;
-  guint focus_in : 1;
-  guint have_size : 1;
-  guint need_map : 1;
-  guint is_mapped : 1;
-  guint active : 1;
+  guint16 GSEAL (request_width);
+  guint16 GSEAL (request_height);
+  guint16 GSEAL (current_width);
+  guint16 GSEAL (current_height);
+
+  GdkWindow *GSEAL (plug_window);
+  GtkWidget *GSEAL (plug_widget);
+
+  gshort GSEAL (xembed_version); /* -1 == not xembed */
+  guint GSEAL (same_app : 1);
+  guint GSEAL (focus_in : 1);
+  guint GSEAL (have_size : 1);
+  guint GSEAL (need_map : 1);
+  guint GSEAL (is_mapped : 1);
+  guint GSEAL (active : 1);
 
-  GtkAccelGroup *accel_group;
-  GtkWidget *toplevel;
+  GtkAccelGroup *GSEAL (accel_group);
+  GtkWidget *GSEAL (toplevel);
 };
 
 struct _GtkSocketClass
@@ -90,6 +90,7 @@
 void            gtk_socket_add_id (GtkSocket       *socket_,
 				   GdkNativeWindow  window_id);
 GdkNativeWindow gtk_socket_get_id (GtkSocket       *socket_);
+GdkWindow*      gtk_socket_get_plug_window (GtkSocket       *socket_);
 
 #ifndef GTK_DISABLE_DEPRECATED
 void           gtk_socket_steal    (GtkSocket      *socket_,