X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtksocket.h;h=65f52e013cb821153651e4e888a132c01c33cbbb;hb=1865b9a1116d166c9abc5c75f5d01270574007c5;hp=a3f4d489ada195e0c818d2bc3d84b47864439b12;hpb=b1165617b79f589695172db638bd101c44c74ea6;p=~andy%2Fgtk

diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index a3f4d489a..65f52e013 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -12,26 +12,30 @@
  * 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_SOCKET_H__
 #define __GTK_SOCKET_H__
 
-#include <gtk/gtkcontainer.h>
+#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkx.h> can be included directly."
+#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gtk/gtk.h>
 
+#ifdef GDK_WINDOWING_X11
+
+#include <gdk/gdkx.h>
+
+G_BEGIN_DECLS
 
 #define GTK_TYPE_SOCKET            (gtk_socket_get_type ())
 #define GTK_SOCKET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket))
@@ -43,29 +47,13 @@ extern "C" {
 
 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
@@ -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_);
 
-GType          gtk_socket_get_type (void) G_GNUC_CONST;
-GtkWidget*     gtk_socket_new      (void);
-
-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__ */