summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Janik <timj@src.gnome.org>1998-03-09 07:18:33 +0000
committerTim Janik <timj@src.gnome.org>1998-03-09 07:18:33 +0000
commitc9f7f2a0f80ad277b55f346609b4127445ae2042 (patch)
tree3004c9dcef9565876ad6b0a446e9b37e09c377cc
parentd894d2dc0c86734920528c7c35d49c0dfb0bf6e5 (diff)
downloadgtk+-c9f7f2a0f80ad277b55f346609b4127445ae2042.tar.gz
patch from lars for construct behaviour.
-timj
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-07
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-27
-rw-r--r--ChangeLog.pre-2-47
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gtk/gtkspinbutton.c34
-rw-r--r--gtk/gtkspinbutton.h6
9 files changed, 79 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index bcc80ad951..feecee96b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 9 08:07:01 1998 Tim Janik <timj@gimp.org>
+
+ * gtk/gtkspinbutton.h:
+ * gtk/gtkspinbutton.c:
+ applied gtk-hamann_jeske-980308-0.patch.gz to have a
+ gtk_spin_button_construct() function
+
Mon Mar 9 01:01:41 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkrc.c: No, you can't add a GtkStyle * to a
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bcc80ad951..feecee96b8 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Mon Mar 9 08:07:01 1998 Tim Janik <timj@gimp.org>
+
+ * gtk/gtkspinbutton.h:
+ * gtk/gtkspinbutton.c:
+ applied gtk-hamann_jeske-980308-0.patch.gz to have a
+ gtk_spin_button_construct() function
+
Mon Mar 9 01:01:41 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkrc.c: No, you can't add a GtkStyle * to a
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bcc80ad951..feecee96b8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Mar 9 08:07:01 1998 Tim Janik <timj@gimp.org>
+
+ * gtk/gtkspinbutton.h:
+ * gtk/gtkspinbutton.c:
+ applied gtk-hamann_jeske-980308-0.patch.gz to have a
+ gtk_spin_button_construct() function
+
Mon Mar 9 01:01:41 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkrc.c: No, you can't add a GtkStyle * to a
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bcc80ad951..feecee96b8 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Mon Mar 9 08:07:01 1998 Tim Janik <timj@gimp.org>
+
+ * gtk/gtkspinbutton.h:
+ * gtk/gtkspinbutton.c:
+ applied gtk-hamann_jeske-980308-0.patch.gz to have a
+ gtk_spin_button_construct() function
+
Mon Mar 9 01:01:41 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkrc.c: No, you can't add a GtkStyle * to a
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bcc80ad951..feecee96b8 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Mon Mar 9 08:07:01 1998 Tim Janik <timj@gimp.org>
+
+ * gtk/gtkspinbutton.h:
+ * gtk/gtkspinbutton.c:
+ applied gtk-hamann_jeske-980308-0.patch.gz to have a
+ gtk_spin_button_construct() function
+
Mon Mar 9 01:01:41 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkrc.c: No, you can't add a GtkStyle * to a
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bcc80ad951..feecee96b8 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Mar 9 08:07:01 1998 Tim Janik <timj@gimp.org>
+
+ * gtk/gtkspinbutton.h:
+ * gtk/gtkspinbutton.c:
+ applied gtk-hamann_jeske-980308-0.patch.gz to have a
+ gtk_spin_button_construct() function
+
Mon Mar 9 01:01:41 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkrc.c: No, you can't add a GtkStyle * to a
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bcc80ad951..feecee96b8 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Mar 9 08:07:01 1998 Tim Janik <timj@gimp.org>
+
+ * gtk/gtkspinbutton.h:
+ * gtk/gtkspinbutton.c:
+ applied gtk-hamann_jeske-980308-0.patch.gz to have a
+ gtk_spin_button_construct() function
+
Mon Mar 9 01:01:41 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkrc.c: No, you can't add a GtkStyle * to a
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 532db4725b..c779c09206 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -162,26 +162,40 @@ gtk_spin_button_init (GtkSpinButton *spin_button)
spin_button->digits = 0;
}
-GtkWidget*
+void
+gtk_spin_button_construct (GtkSpinButton *spin_button,
+ GtkAdjustment *adjustment,
+ gfloat climb_rate,
+ gint digits)
+{
+ char buf[MAX_TEXT_LENGTH];
+
+ g_return_if_fail (spin_button != NULL);
+ g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ g_return_if_fail (digits >= 0 && digits < 128);
+
+ if (!adjustment)
+ adjustment = (GtkAdjustment*) gtk_adjustment_new (0, 0, 0, 0, 0, 0);
+
+ gtk_spin_button_set_adjustment (spin_button, adjustment);
+ spin_button->digits = digits;
+ sprintf (buf, "%0.*f", digits, adjustment->value);
+ gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
+ spin_button->climb_rate = climb_rate;
+}
+
+GtkWidget *
gtk_spin_button_new (GtkAdjustment *adjustment,
gfloat climb_rate,
gint digits)
{
GtkSpinButton *spin;
- char buf[MAX_TEXT_LENGTH];
g_return_val_if_fail (digits >= 0 && digits < 128, NULL);
spin = gtk_type_new (gtk_spin_button_get_type ());
- if (!adjustment)
- adjustment = (GtkAdjustment*) gtk_adjustment_new (0, 0, 0, 0, 0, 0);
-
- gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON (spin), adjustment);
- spin->digits = digits;
- sprintf (buf, "%0.*f", digits, adjustment->value);
- gtk_entry_set_text (GTK_ENTRY (spin), buf);
- spin->climb_rate = climb_rate;
+ gtk_spin_button_construct (spin, adjustment, climb_rate, digits);
return GTK_WIDGET (spin);
}
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 36cef2be31..b9aed002a6 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -79,6 +79,12 @@ struct _GtkSpinButtonClass
guint
gtk_spin_button_get_type (void);
+void
+gtk_spin_button_construct (GtkSpinButton *spin_button,
+ GtkAdjustment *adjustment,
+ gfloat climb_rate,
+ gint digits);
+
GtkWidget *
gtk_spin_button_new (GtkAdjustment *adjustment,
gfloat climb_rate,