When gtk_widget_draw() is called on a REDRAW_PENDING widget, draw it and

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>)
This commit is contained in:
Owen Taylor 1998-03-26 20:57:29 +00:00 committed by Owen Taylor
parent d38e339ebb
commit a74e338517
13 changed files with 122 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 = \

View File

@ -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));
}
}

View File

@ -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)
{