summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog13
-rw-r--r--ChangeLog.pre-2-013
-rw-r--r--ChangeLog.pre-2-1013
-rw-r--r--ChangeLog.pre-2-213
-rw-r--r--ChangeLog.pre-2-413
-rw-r--r--ChangeLog.pre-2-613
-rw-r--r--ChangeLog.pre-2-813
-rw-r--r--gtk/gtkhscale.c2
-rw-r--r--gtk/gtklabel.c7
-rw-r--r--gtk/gtkmain.c11
-rw-r--r--gtk/gtkvscale.c2
11 files changed, 108 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 32239bafd..6e3189715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
+ size computation (Damon Chaplin).
+
+ * gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
+ buffer size to 32 characters (Damon Chaplin).
+ * gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
+
+ * gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
+ iteration_done==TRUE since we will most likely not get invoked again
+ (Marius Vollmer).
+
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 32239bafd..6e3189715 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
+ size computation (Damon Chaplin).
+
+ * gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
+ buffer size to 32 characters (Damon Chaplin).
+ * gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
+
+ * gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
+ iteration_done==TRUE since we will most likely not get invoked again
+ (Marius Vollmer).
+
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 32239bafd..6e3189715 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
+ size computation (Damon Chaplin).
+
+ * gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
+ buffer size to 32 characters (Damon Chaplin).
+ * gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
+
+ * gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
+ iteration_done==TRUE since we will most likely not get invoked again
+ (Marius Vollmer).
+
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 32239bafd..6e3189715 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
+ size computation (Damon Chaplin).
+
+ * gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
+ buffer size to 32 characters (Damon Chaplin).
+ * gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
+
+ * gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
+ iteration_done==TRUE since we will most likely not get invoked again
+ (Marius Vollmer).
+
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 32239bafd..6e3189715 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
+ size computation (Damon Chaplin).
+
+ * gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
+ buffer size to 32 characters (Damon Chaplin).
+ * gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
+
+ * gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
+ iteration_done==TRUE since we will most likely not get invoked again
+ (Marius Vollmer).
+
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 32239bafd..6e3189715 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
+ size computation (Damon Chaplin).
+
+ * gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
+ buffer size to 32 characters (Damon Chaplin).
+ * gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
+
+ * gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
+ iteration_done==TRUE since we will most likely not get invoked again
+ (Marius Vollmer).
+
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 32239bafd..6e3189715 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Wed Apr 8 00:00:48 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtklabel.c (gtk_label_expose): don't take '\n' into account for
+ size computation (Damon Chaplin).
+
+ * gtk/gtkvscale.c (gtk_vscale_draw_value): adjusted static snprintf()
+ buffer size to 32 characters (Damon Chaplin).
+ * gtk/gtkhscale.c (gtk_hscale_draw_value): likewise.
+
+ * gtk/gtkmain.c (gtk_main_iteration_do): gdk_flush() the X-queue if
+ iteration_done==TRUE since we will most likely not get invoked again
+ (Marius Vollmer).
+
Mon Apr 6 23:48:29 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkwindow.c (gtk_window_realize): Set the
diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index 3c1e42dbc..334503044 100644
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -333,7 +333,7 @@ static void
gtk_hscale_draw_value (GtkScale *scale)
{
GtkStateType state_type;
- gchar buffer[16];
+ gchar buffer[32];
gint text_width;
gint width, height;
gint x, y;
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 0f30935ce..2616c91d2 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -264,8 +264,9 @@ gtk_label_size_request (GtkWidget *widget,
{
if (row->next)
width = MAX (width,
- gdk_text_width (GTK_WIDGET (label)->style->font, row->data,
- (gchar*) row->next->data - (gchar*) row->data));
+ gdk_text_width (GTK_WIDGET (label)->style->font,
+ row->data,
+ (gchar*) row->next->data - (gchar*) row->data) - 1);
else
width = MAX (width, gdk_string_width (GTK_WIDGET (label)->style->font, row->data));
row = row->next;
@@ -322,7 +323,7 @@ gtk_label_expose (GtkWidget *widget,
row = label->row;
while (row && row->next)
{
- len = (gchar*) row->next->data - (gchar*) row->data;
+ len = (gchar*) row->next->data - (gchar*) row->data - 1;
offset = 0;
if (label->jtype == GTK_JUSTIFY_CENTER)
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b48370d87..aede3913d 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -519,11 +519,19 @@ gtk_main_iteration_do (gboolean blocking)
if (current_timeouts)
{
gtk_handle_current_timeouts( gdk_time_get());
+
+ if (iteration_done)
+ gdk_flush ();
+
return iteration_done;
}
if (current_idles)
{
gtk_handle_current_idles ();
+
+ if (iteration_done)
+ gdk_flush ();
+
return iteration_done;
}
@@ -738,6 +746,9 @@ event_handling_done:
*/
gtk_handle_timeouts ();
+ if (iteration_done)
+ gdk_flush ();
+
return iteration_done;
}
diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index 292d3a7bc..873058143 100644
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -334,7 +334,7 @@ static void
gtk_vscale_draw_value (GtkScale *scale)
{
GtkStateType state_type;
- gchar buffer[16];
+ gchar buffer[32];
gint text_width;
gint width, height;
gint x, y;
View Lorry Controller Status