Removed size_request from GtkTearoffMenuItem

[~andy/gtk] / gtk / gtkplug.h

diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index ce41c5a6a82b6229c42f85be403d95dc4117c569..679c065463808133b2482ba1bb4e994d381bdca2 100644 (file)
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -20,56 +20,82 @@
  * 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/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_PLUG_H__
 #define __GTK_PLUG_H__
 
 
-#include <gdk/gdk.h>
+#include <gtk/gtksocket.h>
 #include <gtk/gtkwindow.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PLUG            (gtk_plug_get_type ())
-#define GTK_PLUG(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PLUG, GtkPlug))
-#define GTK_PLUG_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PLUG, GtkPlugClass))
-#define GTK_IS_PLUG(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_PLUG))
-#define GTK_IS_PLUG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PLUG))
-#define GTK_PLUG_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PLUG, GtkPlugClass))
+#define GTK_PLUG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG, GtkPlug))
+#define GTK_PLUG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PLUG, GtkPlugClass))
+#define GTK_IS_PLUG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PLUG))
+#define GTK_IS_PLUG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PLUG))
+#define GTK_PLUG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLUG, GtkPlugClass))
 
 
-typedef struct _GtkPlug        GtkPlug;
-typedef struct _GtkPlugClass   GtkPlugClass;
+typedef struct _GtkPlug              GtkPlug;
+typedef struct _GtkPlugPrivate       GtkPlugPrivate;
+typedef struct _GtkPlugClass         GtkPlugClass;
 
 
 struct _GtkPlug
 {
   GtkWindow window;
 
-  GdkWindow *socket_window;
-  gboolean   same_app;
+  GtkPlugPrivate *priv;
 };
 
 struct _GtkPlugClass
 {
   GtkWindowClass parent_class;
+
+  void (*embedded) (GtkPlug *plug);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType    gtk_plug_get_type  (void) G_GNUC_CONST;
-void       gtk_plug_construct (GtkPlug *plug, GdkNativeWindow socket_id);
-GtkWidget* gtk_plug_new       (GdkNativeWindow socket_id);
+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);
+#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);
+
+gboolean  gtk_plug_get_embedded (GtkPlug         *plug);
 
+GdkWindow *gtk_plug_get_socket_window (GtkPlug   *plug);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+void _gtk_plug_add_to_socket      (GtkPlug   *plug,
+                                  GtkSocket *socket_);
+void _gtk_plug_remove_from_socket (GtkPlug   *plug,
+                                  GtkSocket *socket_);
 
+G_END_DECLS
 
 #endif /* __GTK_PLUG_H__ */