summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Jeske <stefan@gtk.org>1998-12-14 19:13:58 +0000
committerStefan Jeske <stefan@src.gnome.org>1998-12-14 19:13:58 +0000
commitc242e9e36c5eab54d777f101c596d7e7e91c0f48 (patch)
tree7e38f8243ef4c8b8ea7d2d98b6c80138fb766e08
parent7facb75c85ddd3f98f664af7a65eaa7344d44c11 (diff)
downloadgtk+-c242e9e36c5eab54d777f101c596d7e7e91c0f48.tar.gz
Only call gtk_spin_button_update if the spinbutton is editable.
Mon Dec 14 20:04:31 1998 Stefan Jeske <stefan@gtk.org> * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if the spinbutton is editable.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkspinbutton.c11
8 files changed, 42 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d54ac352bd..0afb4a92d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998 Stefan Jeske <stefan@gtk.org>
+
+ * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+ the spinbutton is editable.
+
Mon Dec 14 12:24:13 1998 Owen Taylor <otaylor@redhat.com>
* HACKING: Added gettext-10.35
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d54ac352bd..0afb4a92d4 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998 Stefan Jeske <stefan@gtk.org>
+
+ * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+ the spinbutton is editable.
+
Mon Dec 14 12:24:13 1998 Owen Taylor <otaylor@redhat.com>
* HACKING: Added gettext-10.35
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d54ac352bd..0afb4a92d4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998 Stefan Jeske <stefan@gtk.org>
+
+ * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+ the spinbutton is editable.
+
Mon Dec 14 12:24:13 1998 Owen Taylor <otaylor@redhat.com>
* HACKING: Added gettext-10.35
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d54ac352bd..0afb4a92d4 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998 Stefan Jeske <stefan@gtk.org>
+
+ * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+ the spinbutton is editable.
+
Mon Dec 14 12:24:13 1998 Owen Taylor <otaylor@redhat.com>
* HACKING: Added gettext-10.35
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d54ac352bd..0afb4a92d4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998 Stefan Jeske <stefan@gtk.org>
+
+ * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+ the spinbutton is editable.
+
Mon Dec 14 12:24:13 1998 Owen Taylor <otaylor@redhat.com>
* HACKING: Added gettext-10.35
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d54ac352bd..0afb4a92d4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998 Stefan Jeske <stefan@gtk.org>
+
+ * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+ the spinbutton is editable.
+
Mon Dec 14 12:24:13 1998 Owen Taylor <otaylor@redhat.com>
* HACKING: Added gettext-10.35
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d54ac352bd..0afb4a92d4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Dec 14 20:04:31 1998 Stefan Jeske <stefan@gtk.org>
+
+ * gtk/gtkspinbutton.c: Only call gtk_spin_button_update if
+ the spinbutton is editable.
+
Mon Dec 14 12:24:13 1998 Owen Taylor <otaylor@redhat.com>
* HACKING: Added gettext-10.35
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index e806f85704..869a0f2656 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -700,7 +700,8 @@ gtk_spin_button_focus_out (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
- gtk_spin_button_update (GTK_SPIN_BUTTON (widget));
+ if (GTK_EDITABLE (widget)->editable)
+ gtk_spin_button_update (GTK_SPIN_BUTTON (widget));
return GTK_WIDGET_CLASS (parent_class)->focus_out_event (widget, event);
}
@@ -726,7 +727,8 @@ gtk_spin_button_button_press (GtkWidget *widget,
gtk_grab_add (widget);
spin->button = event->button;
- gtk_spin_button_update (spin);
+ if (GTK_EDITABLE (widget)->editable)
+ gtk_spin_button_update (spin);
if (event->y <= widget->requisition.height / 2)
{
@@ -969,8 +971,9 @@ gtk_spin_button_key_press (GtkWidget *widget,
key_repeat = (event->time == spin->ev_time);
- if (key == GDK_Up || key == GDK_Down ||
- key == GDK_Page_Up || key == GDK_Page_Down)
+ if (GTK_EDITABLE (widget)->editable &&
+ (key == GDK_Up || key == GDK_Down ||
+ key == GDK_Page_Up || key == GDK_Page_Down))
gtk_spin_button_update (spin);
switch (key)