X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkplug.h;h=bd6a393cb8fb5009daf446065b0b63d1b2334f59;hb=3c8e1c92a85b2e41161698f141747ced2c574f32;hp=0ac69d243f85f3e492e6a0cea2eaf9c8258589c7;hpb=2a1b3edd187b610c93959ae8c82e98028560c621;p=~andy%2Fgtk
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 0ac69d243..bd6a393cb 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -2,49 +2,54 @@
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see .
*/
/*
- * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
+ * 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 can be included directly."
+#endif
#include
-#include
+#ifdef GDK_WINDOWING_X11
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include
+#include
+
+
+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 _GtkPlugPrivate GtkPlugPrivate;
typedef struct _GtkPlugClass GtkPlugClass;
@@ -52,24 +57,41 @@ struct _GtkPlug
{
GtkWindow window;
- GdkWindow *socket_window;
- gint 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);
};
+GType gtk_plug_get_type (void) G_GNUC_CONST;
-GtkType gtk_plug_get_type (void);
-void gtk_plug_construct (GtkPlug *plug, GdkNativeWindow socket_id);
-GtkWidget* gtk_plug_new (GdkNativeWindow socket_id);
+#ifndef GDK_MULTIHEAD_SAFE
+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,
+ 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__ */