X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtksocket.h;h=65f52e013cb821153651e4e888a132c01c33cbbb;hb=HEAD;hp=bdc4baecf4273c8e800461f6158b605cef4601f1;hpb=c0f78ae00e839052a66ded3792888e7240821323;p=~andy%2Fgtk
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index bdc4baecf..65f52e013 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -12,68 +12,56 @@
* 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 .
*/
/*
* 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_SOCKET_H__
#define __GTK_SOCKET_H__
-#include
+#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include
+#ifdef GDK_WINDOWING_X11
+
+#include
+
+G_BEGIN_DECLS
#define GTK_TYPE_SOCKET (gtk_socket_get_type ())
-#define GTK_SOCKET(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket))
-#define GTK_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOCKET, GtkSocketClass))
-#define GTK_IS_SOCKET(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SOCKET))
-#define GTK_IS_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOCKET))
-#define GTK_SOCKET_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SOCKET, GtkSocketClass))
+#define GTK_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket))
+#define GTK_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOCKET, GtkSocketClass))
+#define GTK_IS_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOCKET))
+#define GTK_IS_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOCKET))
+#define GTK_SOCKET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOCKET, GtkSocketClass))
typedef struct _GtkSocket GtkSocket;
typedef struct _GtkSocketClass GtkSocketClass;
+typedef struct _GtkSocketPrivate GtkSocketPrivate;
struct _GtkSocket
{
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;
-
- GtkAccelGroup *accel_group;
- GtkWidget *toplevel;
+ GtkSocketPrivate *priv;
};
struct _GtkSocketClass
{
GtkContainerClass parent_class;
- void (*plug_added) (GtkSocket *socket);
- gboolean (*plug_removed) (GtkSocket *socket);
+ void (*plug_added) (GtkSocket *socket_);
+ gboolean (*plug_removed) (GtkSocket *socket_);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
@@ -82,22 +70,15 @@ struct _GtkSocketClass
void (*_gtk_reserved4) (void);
};
+GType gtk_socket_get_type (void) G_GNUC_CONST;
+GtkWidget *gtk_socket_new (void);
+void gtk_socket_add_id (GtkSocket *socket_,
+ Window window);
+Window gtk_socket_get_id (GtkSocket *socket_);
+GdkWindow *gtk_socket_get_plug_window (GtkSocket *socket_);
-GtkWidget* gtk_socket_new (void);
-GtkType gtk_socket_get_type (void) G_GNUC_CONST;
-
-void gtk_socket_add_id (GtkSocket *socket,
- GdkNativeWindow window_id);
-GdkNativeWindow gtk_socket_get_id (GtkSocket *socket);
-
-#ifndef GTK_DISABLE_DEPRECATED
-void gtk_socket_steal (GtkSocket *socket,
- GdkNativeWindow wid);
-#endif /* GTK_DISABLE_DEPRECATED */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+#endif /* GDK_WINDOWING_X11 */
#endif /* __GTK_SOCKET_H__ */