X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkadjustment.h;h=ebb6c4c3cdeb69987e826128e72bd0a4bb1a7b2b;hb=3c8e1c92a85b2e41161698f141747ced2c574f32;hp=84a31074de4c6988ef9d06380ca98c9023fa0d94;hpb=afee2c67c5091539cbe6270b14e7e74b2a7b60a7;p=~andy%2Fgtk
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 84a31074d..ebb6c4c3c 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -8,85 +8,114 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
* 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/.
*/
#ifndef __GTK_ADJUSTMENT_H__
#define __GTK_ADJUSTMENT_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
#include
-#include
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include
+G_BEGIN_DECLS
#define GTK_TYPE_ADJUSTMENT (gtk_adjustment_get_type ())
-#define GTK_ADJUSTMENT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustment))
-#define GTK_ADJUSTMENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
-#define GTK_IS_ADJUSTMENT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_ADJUSTMENT))
-#define GTK_IS_ADJUSTMENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ADJUSTMENT))
-#define GTK_ADJUSTMENT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
+#define GTK_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustment))
+#define GTK_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
+#define GTK_IS_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ADJUSTMENT))
+#define GTK_IS_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ADJUSTMENT))
+#define GTK_ADJUSTMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
-typedef struct _GtkAdjustment GtkAdjustment;
-typedef struct _GtkAdjustmentClass GtkAdjustmentClass;
+typedef struct _GtkAdjustmentPrivate GtkAdjustmentPrivate;
+typedef struct _GtkAdjustmentClass GtkAdjustmentClass;
+/**
+ * GtkAdjustment:
+ *
+ * The #GtkAdjustment struct contains only private fields and
+ * should not be directly accessed.
+ */
struct _GtkAdjustment
{
- GtkData data;
-
- gfloat lower;
- gfloat upper;
- gfloat value;
- gfloat step_increment;
- gfloat page_increment;
- gfloat page_size;
+ GInitiallyUnowned parent_instance;
+
+ GtkAdjustmentPrivate *priv;
};
struct _GtkAdjustmentClass
{
- GtkDataClass parent_class;
-
- void (* changed) (GtkAdjustment *adjustment);
+ GInitiallyUnownedClass parent_class;
+
+ void (* changed) (GtkAdjustment *adjustment);
void (* value_changed) (GtkAdjustment *adjustment);
-};
+ /* Padding for future expansion */
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
+};
-GtkType gtk_adjustment_get_type (void);
-GtkObject* gtk_adjustment_new (gfloat value,
- gfloat lower,
- gfloat upper,
- gfloat step_increment,
- gfloat page_increment,
- gfloat page_size);
-void gtk_adjustment_changed (GtkAdjustment *adjustment);
-void gtk_adjustment_value_changed (GtkAdjustment *adjustment);
-void gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
- gfloat lower,
- gfloat upper);
-void gtk_adjustment_set_value (GtkAdjustment *adjustment,
- gfloat value);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType gtk_adjustment_get_type (void) G_GNUC_CONST;
+GtkAdjustment* 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);
+GDK_AVAILABLE_IN_3_2
+gdouble gtk_adjustment_get_minimum_increment (GtkAdjustment *adjustment);
+
+G_END_DECLS
#endif /* __GTK_ADJUSTMENT_H__ */