]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtklayout.h
Drop use of GDK_DISABLE_DEPRECATED guards in gtk
[~andy/gtk] / gtk / gtklayout.h
index b446fb331f1f07d8d4a339e9cd977b9d2fd45761..709c35451ca0c4a9bce14a504390964d2b5b2602 100644 (file)
@@ -50,40 +50,22 @@ G_BEGIN_DECLS
 #define GTK_LAYOUT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass))
 
 
-typedef struct _GtkLayout        GtkLayout;
-typedef struct _GtkLayoutClass   GtkLayoutClass;
+typedef struct _GtkLayout              GtkLayout;
+typedef struct _GtkLayoutPrivate       GtkLayoutPrivate;
+typedef struct _GtkLayoutClass         GtkLayoutClass;
 
 struct _GtkLayout
 {
-  GtkContainer GSEAL (container);
-
-  GList *GSEAL (children);
-
-  guint GSEAL (width);
-  guint GSEAL (height);
-
-  GtkAdjustment *GSEAL (hadjustment);
-  GtkAdjustment *GSEAL (vadjustment);
-
-  /*< public >*/
-  GdkWindow *GSEAL (bin_window);
+  GtkContainer container;
 
   /*< private >*/
-  GdkVisibilityState GSEAL (visibility);
-  gint GSEAL (scroll_x);
-  gint GSEAL (scroll_y);
-
-  guint GSEAL (freeze_count);
+  GtkLayoutPrivate *priv;
 };
 
 struct _GtkLayoutClass
 {
   GtkContainerClass parent_class;
 
-  void  (*set_scroll_adjustments)   (GtkLayout     *layout,
-                                    GtkAdjustment  *hadjustment,
-                                    GtkAdjustment  *vadjustment);
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -112,12 +94,17 @@ void           gtk_layout_get_size        (GtkLayout     *layout,
                                           guint         *width,
                                           guint         *height);
 
+GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout     *layout);
+GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout     *layout);
+GDK_DEPRECATED_FOR(gtk_scrollable_set_hadjustment)
 void           gtk_layout_set_hadjustment (GtkLayout     *layout,
-                                          GtkAdjustment *adjustment);
+                                           GtkAdjustment *adjustment);
+GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
 void           gtk_layout_set_vadjustment (GtkLayout     *layout,
-                                          GtkAdjustment *adjustment);
+                                           GtkAdjustment *adjustment);
+
 
 G_END_DECLS