Remove sealed members from GtkTreeModelSort

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

diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index b9d3785ce6755c543fbf992cf06914b7c7c08a6f..d8485f109aef7c31af548e54596269b8459a9d4b 100644 (file)
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#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
 
@@ -32,7 +32,6 @@
 #define __GTK_FRAME_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 
 
@@ -46,20 +45,16 @@ G_BEGIN_DECLS
 #define GTK_IS_FRAME_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FRAME))
 #define GTK_FRAME_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FRAME, GtkFrameClass))
 
-
-typedef struct _GtkFrame       GtkFrame;
-typedef struct _GtkFrameClass  GtkFrameClass;
+typedef struct _GtkFrame              GtkFrame;
+typedef struct _GtkFramePrivate       GtkFramePrivate;
+typedef struct _GtkFrameClass         GtkFrameClass;
 
 struct _GtkFrame
 {
   GtkBin bin;
 
-  GtkWidget *GSEAL (label_widget);
-  gint16 GSEAL (shadow_type);
-  gfloat GSEAL (label_xalign);
-  gfloat GSEAL (label_yalign);
-
-  GtkAllocation GSEAL (child_allocation);
+  /*< private >*/
+  GtkFramePrivate *priv;
 };
 
 struct _GtkFrameClass
@@ -67,6 +62,12 @@ struct _GtkFrameClass
   GtkBinClass parent_class;
 
   void (*compute_child_allocation) (GtkFrame *frame, GtkAllocation *allocation);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };