Clamp size of child to at least 1x1. (#82431, Boris Shingarov.)

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

diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index d33f32897d512300fe6e976d12293a3af493801e..0c6cf648da91870e58877d20b9740d3abfbbc8b6 100644 (file)
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -2,29 +2,30 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * 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/. 
  */
 
 #include "gtkadjustment.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 
@@ -61,7 +62,7 @@ gtk_adjustment_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      adjustment_type = gtk_type_unique (GTK_TYPE_DATA, &adjustment_info);
+      adjustment_type = gtk_type_unique (GTK_TYPE_OBJECT, &adjustment_info);
     }
 
   return adjustment_type;
@@ -74,25 +75,23 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
 
   object_class = (GtkObjectClass*) class;
 
+  class->changed = NULL;
+  class->value_changed = NULL;
+
   adjustment_signals[CHANGED] =
     gtk_signal_new ("changed",
                     GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkAdjustmentClass, changed),
-                    gtk_marshal_NONE__NONE,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   adjustment_signals[VALUE_CHANGED] =
     gtk_signal_new ("value_changed",
                     GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkAdjustmentClass, value_changed),
-                    gtk_marshal_NONE__NONE,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, adjustment_signals, LAST_SIGNAL);
-
-  class->changed = NULL;
-  class->value_changed = NULL;
 }
 
 static void
@@ -107,12 +106,12 @@ gtk_adjustment_init (GtkAdjustment *adjustment)
 }
 
 GtkObject*
-gtk_adjustment_new (gfloat value,
-                   gfloat lower,
-                   gfloat upper,
-                   gfloat step_increment,
-                   gfloat page_increment,
-                   gfloat page_size)
+gtk_adjustment_new (gdouble value,
+                   gdouble lower,
+                   gdouble upper,
+                   gdouble step_increment,
+                   gdouble page_increment,
+                   gdouble page_size)
 {
   GtkAdjustment *adjustment;
 
@@ -128,11 +127,27 @@ gtk_adjustment_new (gfloat value,
   return GTK_OBJECT (adjustment);
 }
 
+/**
+ * gtk_adjustment_get_value:
+ * @adjustment: a #GtkAdjustment
+ *
+ * Gets the current value of the adjustment. See
+ * gtk_adjustment_set_value ().
+ *
+ * Return value: The current value of the adjustment.
+ **/
+gdouble
+gtk_adjustment_get_value (GtkAdjustment *adjustment)
+{
+  g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0.);
+
+  return adjustment->value;
+}
+
 void
 gtk_adjustment_set_value (GtkAdjustment        *adjustment,
-                         gfloat                value)
+                         gdouble               value)
 {
-  g_return_if_fail (adjustment != NULL);
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
   value = CLAMP (value, adjustment->lower, adjustment->upper);
@@ -148,7 +163,6 @@ gtk_adjustment_set_value (GtkAdjustment        *adjustment,
 void
 gtk_adjustment_changed (GtkAdjustment        *adjustment)
 {
-  g_return_if_fail (adjustment != NULL);
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
   gtk_signal_emit (GTK_OBJECT (adjustment), adjustment_signals[CHANGED]);
@@ -157,7 +171,6 @@ gtk_adjustment_changed (GtkAdjustment        *adjustment)
 void
 gtk_adjustment_value_changed (GtkAdjustment        *adjustment)
 {
-  g_return_if_fail (adjustment != NULL);
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
   gtk_signal_emit (GTK_OBJECT (adjustment), adjustment_signals[VALUE_CHANGED]);
@@ -165,12 +178,11 @@ gtk_adjustment_value_changed (GtkAdjustment        *adjustment)
 
 void
 gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
-                          gfloat         lower,
-                          gfloat         upper)
+                          gdouble        lower,
+                          gdouble        upper)
 {
-  gint need_emission;
+  gboolean need_emission;
 
-  g_return_if_fail (adjustment != NULL);
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
   lower = CLAMP (lower, adjustment->lower, adjustment->upper);