box: Fix includes so hbox/vbox compile warning-free

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

diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index 47fb39053dba6ae30042d92559932c97f5e5fa34..1c82d197d8053bba1437afb60d7dc86821752bba 100644 (file)
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -29,7 +29,7 @@
  * their parents.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -42,6 +42,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #define GTK_TYPE_HANDLE_BOX            (gtk_handle_box_get_type ())
 #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))
@@ -49,32 +51,16 @@ G_BEGIN_DECLS
 #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;
-typedef struct _GtkHandleBoxClass  GtkHandleBoxClass;
+typedef struct _GtkHandleBox              GtkHandleBox;
+typedef struct _GtkHandleBoxPrivate       GtkHandleBoxPrivate;
+typedef struct _GtkHandleBoxClass         GtkHandleBoxClass;
 
 struct _GtkHandleBox
 {
   GtkBin bin;
 
-  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            GSEAL (deskoff_x); /* Offset between root relative coords */
-  gint            GSEAL (deskoff_y); /* and deskrelative coords             */
-
-  GtkAllocation   GSEAL (attach_allocation);
-  GtkAllocation   GSEAL (float_allocation);
+  /*< private >*/
+  GtkHandleBoxPrivate *priv;
 };
 
 struct _GtkHandleBoxClass
@@ -95,18 +81,28 @@ struct _GtkHandleBoxClass
 
 
 GType         gtk_handle_box_get_type             (void) G_GNUC_CONST;
+GDK_DEPRECATED
 GtkWidget*    gtk_handle_box_new                  (void);
+GDK_DEPRECATED
 void          gtk_handle_box_set_shadow_type      (GtkHandleBox    *handle_box,
                                                    GtkShadowType    type);
+GDK_DEPRECATED
 GtkShadowType gtk_handle_box_get_shadow_type      (GtkHandleBox    *handle_box);
+GDK_DEPRECATED
 void          gtk_handle_box_set_handle_position  (GtkHandleBox    *handle_box,
                                                   GtkPositionType  position);
+GDK_DEPRECATED
 GtkPositionType gtk_handle_box_get_handle_position(GtkHandleBox    *handle_box);
+GDK_DEPRECATED
 void          gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
                                                   GtkPositionType  edge);
+GDK_DEPRECATED
 GtkPositionType gtk_handle_box_get_snap_edge      (GtkHandleBox    *handle_box);
+GDK_DEPRECATED
 gboolean      gtk_handle_box_get_child_detached   (GtkHandleBox    *handle_box);
 
+#endif /* GTK_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* __GTK_HANDLE_BOX_H__ */