Revert name change

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

diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index 1f6ec3e2929bd13cfda7f5197845ab4beebeda0f..9ee0fccfd699a4f5b7b86abdcf39a2f041f4afe2 100644 (file)
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -22,13 +22,16 @@
  * 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/.
  */
 
 /* The GtkHandleBox is to allow widgets to be dragged in and out of
  * their parents.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
 #ifndef __GTK_HANDLE_BOX_H__
 #define __GTK_HANDLE_BOX_H__
@@ -38,17 +41,14 @@
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_HANDLE_BOX            (gtk_handle_box_get_type ())
-#define GTK_HANDLE_BOX(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
-#define GTK_HANDLE_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
-#define GTK_IS_HANDLE_BOX(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_HANDLE_BOX))
-#define GTK_IS_HANDLE_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HANDLE_BOX))
-#define GTK_HANDLE_BOX_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
+#define GTK_HANDLE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
+#define GTK_HANDLE_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
+#define GTK_IS_HANDLE_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_HANDLE_BOX))
+#define GTK_IS_HANDLE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HANDLE_BOX))
+#define GTK_HANDLE_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
 
 
 typedef struct _GtkHandleBox       GtkHandleBox;
@@ -58,23 +58,24 @@ struct _GtkHandleBox
 {
   GtkBin bin;
 
-  GdkWindow      *bin_window;  /* parent window for children */
-  GdkWindow      *float_window;
-  GtkShadowType   shadow_type;
-  guint                  handle_position : 2;
-  guint                  float_window_mapped : 1;
-  guint                  child_detached : 1;
-  guint                  in_drag : 1;
-  guint                  shrink_on_detach : 1;
-
-  signed int      snap_edge : 3; /* -1 == unset */
-  
+  GdkWindow      *GSEAL (bin_window);  /* parent window for children */
+  GdkWindow      *GSEAL (float_window);
+  GtkShadowType   GSEAL (shadow_type);
+  guint           GSEAL (handle_position) : 2;
+  guint           GSEAL (float_window_mapped) : 1;
+  guint           GSEAL (child_detached) : 1;
+  guint           GSEAL (in_drag) : 1;
+  guint           GSEAL (shrink_on_detach) : 1;
+
+  signed int      GSEAL (snap_edge : 3); /* -1 == unset */
+
   /* Variables used during a drag
    */
-  gint deskoff_x, deskoff_y; /* Offset between root relative coordinates
-                             * and deskrelative coordinates */
-  GtkAllocation   attach_allocation;
-  GtkAllocation   float_allocation;
+  gint            GSEAL (deskoff_x); /* Offset between root relative coords */
+  gint            GSEAL (deskoff_y); /* and deskrelative coords             */
+
+  GtkAllocation   GSEAL (attach_allocation);
+  GtkAllocation   GSEAL (float_allocation);
 };
 
 struct _GtkHandleBoxClass
@@ -94,8 +95,8 @@ struct _GtkHandleBoxClass
 };
 
 
-GtkType       gtk_handle_box_get_type        (void) G_GNUC_CONST;
-GtkWidget*    gtk_handle_box_new             (void);
+GType         gtk_handle_box_get_type             (void) G_GNUC_CONST;
+GtkWidget*    gtk_handle_box_new                  (void);
 void          gtk_handle_box_set_shadow_type      (GtkHandleBox    *handle_box,
                                                    GtkShadowType    type);
 GtkShadowType gtk_handle_box_get_shadow_type      (GtkHandleBox    *handle_box);
@@ -105,11 +106,8 @@ GtkPositionType gtk_handle_box_get_handle_position(GtkHandleBox    *handle_box);
 void          gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
                                                   GtkPositionType  edge);
 GtkPositionType gtk_handle_box_get_snap_edge      (GtkHandleBox    *handle_box);
+gboolean      gtk_handle_box_get_child_detached   (GtkHandleBox    *handle_box);
 
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_HANDLE_BOX_H__ */