X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkplug.h;h=bd6a393cb8fb5009daf446065b0b63d1b2334f59;hb=cade42d5094ceaa7799aa8e2135959573646a4b6;hp=cd46ea0ec7c4b9ce59212e12aea7d48a500fb3b0;hpb=c77265d3a7326bbe184c14bd85eed17712905e31;p=~andy%2Fgtk

diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index cd46ea0ec..bd6a393cb 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -12,30 +12,33 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_PLUG_H__
 #define __GTK_PLUG_H__
 
+#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkx.h> can be included directly."
+#endif
 
 #include <gdk/gdk.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
 
+#ifdef GDK_WINDOWING_X11
+
+#include <gdk/gdkx.h>
+
+#include <gtk/gtksocket.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
 
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PLUG            (gtk_plug_get_type ())
 #define GTK_PLUG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG, GtkPlug))
@@ -46,6 +49,7 @@ extern "C" {
 
 
 typedef struct _GtkPlug        GtkPlug;
+typedef struct _GtkPlugPrivate GtkPlugPrivate;
 typedef struct _GtkPlugClass   GtkPlugClass;
 
 
@@ -53,12 +57,7 @@ struct _GtkPlug
 {
   GtkWindow window;
 
-  GdkWindow *socket_window;
-  GtkWidget *modality_window;
-  GtkWindowGroup *modality_group;
-  GHashTable *grabbed_keys;
-
-  guint same_app : 1;
+  GtkPlugPrivate *priv;
 };
 
 struct _GtkPlugClass
@@ -74,31 +73,25 @@ struct _GtkPlugClass
   void (*_gtk_reserved4) (void);
 };
 
-
-GType      gtk_plug_get_type  (void) G_GNUC_CONST;
+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);
-GtkWidget* gtk_plug_new_for_display       (GdkDisplay      *display,
-					   GdkNativeWindow  socket_id);
-
-GdkNativeWindow gtk_plug_get_id (GtkPlug         *plug);
-
-void _gtk_plug_add_to_socket      (GtkPlug   *plug,
-				   GtkSocket *socket);
-void _gtk_plug_remove_from_socket (GtkPlug   *plug,
-				   GtkSocket *socket);
+void       gtk_plug_construct_for_display (GtkPlug    *plug,
+                                           GdkDisplay *display,
+                                           Window      socket_id);
+GtkWidget *gtk_plug_new_for_display       (GdkDisplay *display,
+                                           Window      socket_id);
+Window     gtk_plug_get_id                (GtkPlug    *plug);
+gboolean   gtk_plug_get_embedded          (GtkPlug    *plug);
+GdkWindow *gtk_plug_get_socket_window     (GtkPlug    *plug);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
+#endif /* GDK_WINDOWING_X11 */
 
 #endif /* __GTK_PLUG_H__ */