diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 15 | ||||
| -rw-r--r-- | gdk/Makefile.am | 2 | ||||
| -rw-r--r-- | glib/ChangeLog | 5 | ||||
| -rw-r--r-- | glib/Makefile.am | 2 | ||||
| -rw-r--r-- | gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | gtk/gtkentry.c | 3 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 9 |
13 files changed, 122 insertions, 6 deletions
@@ -1,3 +1,18 @@ +Thu Mar 26 15:33:50 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/gtkwidget.c: When gtk_widget_draw() is called on a + REDRAW_PENDING widget, draw it and remove it from the + queue instead of doing nothing. + + * gtk/Makefile.am gdk/Makefile.am: Switch order of includes + directories, to make doubly sure that wrong glibconfig.h + isn't used. (See also glib/ChangeLog) + + * gtk/gtkentry.c (gtk_entry_draw_focus): Don't draw the + cursor unless the entry is editable. + + (From: Stefan Jeske <jeske@braunschweig.netsurf.de>) + Thu Mar 26 08:31:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_propagate_event): do not propagate unhandled key diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 14de93ea3..4bbff7ee6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,18 @@ +Thu Mar 26 15:33:50 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/gtkwidget.c: When gtk_widget_draw() is called on a + REDRAW_PENDING widget, draw it and remove it from the + queue instead of doing nothing. + + * gtk/Makefile.am gdk/Makefile.am: Switch order of includes + directories, to make doubly sure that wrong glibconfig.h + isn't used. (See also glib/ChangeLog) + + * gtk/gtkentry.c (gtk_entry_draw_focus): Don't draw the + cursor unless the entry is editable. + + (From: Stefan Jeske <jeske@braunschweig.netsurf.de>) + Thu Mar 26 08:31:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_propagate_event): do not propagate unhandled key diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 14de93ea3..4bbff7ee6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +Thu Mar 26 15:33:50 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/gtkwidget.c: When gtk_widget_draw() is called on a + REDRAW_PENDING widget, draw it and remove it from the + queue instead of doing nothing. + + * gtk/Makefile.am gdk/Makefile.am: Switch order of includes + directories, to make doubly sure that wrong glibconfig.h + isn't used. (See also glib/ChangeLog) + + * gtk/gtkentry.c (gtk_entry_draw_focus): Don't draw the + cursor unless the entry is editable. + + (From: Stefan Jeske <jeske@braunschweig.netsurf.de>) + Thu Mar 26 08:31:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_propagate_event): do not propagate unhandled key diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 14de93ea3..4bbff7ee6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +Thu Mar 26 15:33:50 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/gtkwidget.c: When gtk_widget_draw() is called on a + REDRAW_PENDING widget, draw it and remove it from the + queue instead of doing nothing. + + * gtk/Makefile.am gdk/Makefile.am: Switch order of includes + directories, to make doubly sure that wrong glibconfig.h + isn't used. (See also glib/ChangeLog) + + * gtk/gtkentry.c (gtk_entry_draw_focus): Don't draw the + cursor unless the entry is editable. + + (From: Stefan Jeske <jeske@braunschweig.netsurf.de>) + Thu Mar 26 08:31:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_propagate_event): do not propagate unhandled key diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 14de93ea3..4bbff7ee6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +Thu Mar 26 15:33:50 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/gtkwidget.c: When gtk_widget_draw() is called on a + REDRAW_PENDING widget, draw it and remove it from the + queue instead of doing nothing. + + * gtk/Makefile.am gdk/Makefile.am: Switch order of includes + directories, to make doubly sure that wrong glibconfig.h + isn't used. (See also glib/ChangeLog) + + * gtk/gtkentry.c (gtk_entry_draw_focus): Don't draw the + cursor unless the entry is editable. + + (From: Stefan Jeske <jeske@braunschweig.netsurf.de>) + Thu Mar 26 08:31:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_propagate_event): do not propagate unhandled key diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 14de93ea3..4bbff7ee6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +Thu Mar 26 15:33:50 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/gtkwidget.c: When gtk_widget_draw() is called on a + REDRAW_PENDING widget, draw it and remove it from the + queue instead of doing nothing. + + * gtk/Makefile.am gdk/Makefile.am: Switch order of includes + directories, to make doubly sure that wrong glibconfig.h + isn't used. (See also glib/ChangeLog) + + * gtk/gtkentry.c (gtk_entry_draw_focus): Don't draw the + cursor unless the entry is editable. + + (From: Stefan Jeske <jeske@braunschweig.netsurf.de>) + Thu Mar 26 08:31:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_propagate_event): do not propagate unhandled key diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 14de93ea3..4bbff7ee6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +Thu Mar 26 15:33:50 1998 Owen Taylor <owt1@cornell.edu> + + * gtk/gtkwidget.c: When gtk_widget_draw() is called on a + REDRAW_PENDING widget, draw it and remove it from the + queue instead of doing nothing. + + * gtk/Makefile.am gdk/Makefile.am: Switch order of includes + directories, to make doubly sure that wrong glibconfig.h + isn't used. (See also glib/ChangeLog) + + * gtk/gtkentry.c (gtk_entry_draw_focus): Don't draw the + cursor unless the entry is editable. + + (From: Stefan Jeske <jeske@braunschweig.netsurf.de>) + Thu Mar 26 08:31:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_propagate_event): do not propagate unhandled key diff --git a/gdk/Makefile.am b/gdk/Makefile.am index a0c4116f1..1013fc234 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -49,7 +49,7 @@ gdkinclude_HEADERS = \ libgdk_la_LDFLAGS = -version-info 1:0:0 \ @x_ldflags@ @x_libs@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I../glib @x_cflags@ +INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ EXTRA_PROGRAMS = gxid diff --git a/glib/ChangeLog b/glib/ChangeLog index 71f57cfe9..f231e6c88 100644 --- a/glib/ChangeLog +++ b/glib/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 25 15:23:37 1998 Owen Taylor <owt1@cornell.edu> + + * Makefile.am: Switched glibconfig.h rule from HEADERS + to DATA, so that it is not added to DISTFILES + Wed Mar 18 22:27:08 PST 1998 * garray.c: g_rarray_truncate length done correctly diff --git a/glib/Makefile.am b/glib/Makefile.am index 0fba3f63b..7ee39bae9 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -22,7 +22,7 @@ libglib_la_SOURCES = \ include_HEADERS = \ glib.h -configinclude_HEADERS = \ +configinclude_DATA = \ glibconfig.h libglib_la_LDFLAGS = -version-info 1:0:0 diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 0c367b36e..668a428ff 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -218,7 +218,7 @@ EXTRA_DIST = \ tree_minus.xbm \ circles.xbm -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I../glib @x_cflags@ +INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ noinst_PROGRAMS = testgtk testinput testselection simple testgtk_LDADD = \ diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index b44bda168..5175aa576 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -609,7 +609,8 @@ gtk_entry_draw_focus (GtkWidget *widget) FALSE, 0, 0, width - 1, height - 1); } - gtk_entry_draw_cursor (GTK_ENTRY (widget)); + if (GTK_EDITABLE (widget)->editable) + gtk_entry_draw_cursor (GTK_ENTRY (widget)); } } diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 90e97a22a..428a63c04 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -1578,8 +1578,13 @@ gtk_widget_draw (GtkWidget *widget, g_return_if_fail (widget != NULL); - if (GTK_WIDGET_DRAWABLE (widget) && - !GTK_WIDGET_REDRAW_PENDING (widget)) + if (GTK_WIDGET_REDRAW_PENDING (widget)) + { + gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING); + } + + if (GTK_WIDGET_DRAWABLE (widget)) { if (!area) { |