Remove GtkObject completely

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

diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 1fe3e4ae8be67016831dac3cc081d83e5961adab..0e7cafbf3077d47d7afa7a35fa3a436c39b79b8b 100644 (file)
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -21,15 +21,17 @@
  * 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/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_ADJUSTMENT_H__
 #define __GTK_ADJUSTMENT_H__
 
-
 #include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
 
 G_BEGIN_DECLS
 
@@ -46,23 +48,23 @@ typedef struct _GtkAdjustmentClass  GtkAdjustmentClass;
 
 struct _GtkAdjustment
 {
-  GtkObject parent_instance;
-  
-  gdouble lower;
-  gdouble upper;
-  gdouble value;
-  gdouble step_increment;
-  gdouble page_increment;
-  gdouble page_size;
+  GInitiallyUnowned parent_instance;
+
+  gdouble GSEAL (lower);
+  gdouble GSEAL (upper);
+  gdouble GSEAL (value);
+  gdouble GSEAL (step_increment);
+  gdouble GSEAL (page_increment);
+  gdouble GSEAL (page_size);
 };
 
 struct _GtkAdjustmentClass
 {
-  GtkObjectClass parent_class;
-  
+  GInitiallyUnownedClass parent_class;
+
   void (* changed)      (GtkAdjustment *adjustment);
   void (* value_changed) (GtkAdjustment *adjustment);
-  
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -72,20 +74,45 @@ struct _GtkAdjustmentClass
 
 
 GType     gtk_adjustment_get_type              (void) G_GNUC_CONST;
-GtkObject* gtk_adjustment_new                  (gdouble          value,
+GObject*   gtk_adjustment_new                  (gdouble          value,
                                                 gdouble          lower,
                                                 gdouble          upper,
                                                 gdouble          step_increment,
                                                 gdouble          page_increment,
                                                 gdouble          page_size);
+
 void      gtk_adjustment_changed               (GtkAdjustment   *adjustment);
 void      gtk_adjustment_value_changed         (GtkAdjustment   *adjustment);
 void      gtk_adjustment_clamp_page            (GtkAdjustment   *adjustment,
                                                 gdouble          lower,
                                                 gdouble          upper);
+
 gdouble           gtk_adjustment_get_value             (GtkAdjustment   *adjustment);
 void      gtk_adjustment_set_value             (GtkAdjustment   *adjustment,
                                                 gdouble          value);
+gdouble    gtk_adjustment_get_lower             (GtkAdjustment   *adjustment);
+void       gtk_adjustment_set_lower             (GtkAdjustment   *adjustment,
+                                                 gdouble          lower);
+gdouble    gtk_adjustment_get_upper             (GtkAdjustment   *adjustment);
+void       gtk_adjustment_set_upper             (GtkAdjustment   *adjustment,
+                                                 gdouble          upper);
+gdouble    gtk_adjustment_get_step_increment    (GtkAdjustment   *adjustment);
+void       gtk_adjustment_set_step_increment    (GtkAdjustment   *adjustment,
+                                                 gdouble          step_increment);
+gdouble    gtk_adjustment_get_page_increment    (GtkAdjustment   *adjustment);
+void       gtk_adjustment_set_page_increment    (GtkAdjustment   *adjustment,
+                                                 gdouble          page_increment);
+gdouble    gtk_adjustment_get_page_size         (GtkAdjustment   *adjustment);
+void       gtk_adjustment_set_page_size         (GtkAdjustment   *adjustment,
+                                                 gdouble          page_size);
+
+void       gtk_adjustment_configure             (GtkAdjustment   *adjustment,
+                                                 gdouble          value,
+                                                gdouble          lower,
+                                                gdouble          upper,
+                                                gdouble          step_increment,
+                                                gdouble          page_increment,
+                                                gdouble          page_size);
 
 G_END_DECLS