X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkplug.h;h=bd6a393cb8fb5009daf446065b0b63d1b2334f59;hb=3c8e1c92a85b2e41161698f141747ced2c574f32;hp=cb9040aff100270dcbd6c68b1159e534b9debd45;hpb=57223c9a056bfff1635ddd1e67f660cd5a61e9ff;p=~andy%2Fgtk
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index cb9040aff..bd6a393cb 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -12,8 +12,7 @@
* 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 .
*/
/*
@@ -23,17 +22,20 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __GTK_PLUG_H__
#define __GTK_PLUG_H__
+#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
#include
+
+#ifdef GDK_WINDOWING_X11
+
+#include
+
#include
-#include
G_BEGIN_DECLS
@@ -47,6 +49,7 @@ G_BEGIN_DECLS
typedef struct _GtkPlug GtkPlug;
+typedef struct _GtkPlugPrivate GtkPlugPrivate;
typedef struct _GtkPlugClass GtkPlugClass;
@@ -54,12 +57,7 @@ struct _GtkPlug
{
GtkWindow window;
- GdkWindow *GSEAL (socket_window);
- GtkWidget *GSEAL (modality_window);
- GtkWindowGroup *GSEAL (modality_group);
- GHashTable *GSEAL (grabbed_keys);
-
- guint GSEAL (same_app) : 1;
+ GtkPlugPrivate *priv;
};
struct _GtkPlugClass
@@ -75,32 +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);
-
-gboolean gtk_plug_get_embedded (GtkPlug *plug);
-
-GdkWindow *gtk_plug_get_socket_window (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);
G_END_DECLS
+#endif /* GDK_WINDOWING_X11 */
+
#endif /* __GTK_PLUG_H__ */