diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-02-28 19:07:46 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-02-28 19:07:46 +0000 |
| commit | 56a2f2c628fb0411f26fa0ecaeee32b5e8aebb32 (patch) | |
| tree | 0f0d9db14a657be55d118ced03fd80857dfe5880 /gtk/gtktext.c | |
| parent | c82dc58f7fceed9878181b50783ebfc80a5a3ae8 (diff) | |
| download | gdk-pixbuf-56a2f2c628fb0411f26fa0ecaeee32b5e8aebb32.tar.gz | |
Remove draw_focus and draw_default (gtk_widget_draw_focus): remove this
2001-02-28 Havoc Pennington <hp@redhat.com>
* gtk/gtkwidget.h (struct _GtkWidgetClass): Remove draw_focus and
draw_default
(gtk_widget_draw_focus): remove this function; we could instead
make it just gtk_widget_draw(), but in most cases I think the
result would be broken user code, so think it's better to have
that code not compile and get fixed
(gtk_widget_draw_default): ditto
* gtk/gtkwidget.c: Add default handlers for focus_in_event and
focus_out_event that set/unset GTK_HAS_FOCUS and call queue_draw
* gtk/gtkwindow.c (gtk_window_set_default): just queue a draw when
widgets lose/get the default, instead of calling draw_default
* docs/Changes-2.0.txt: note about all this
Then fixed every widget in GTK, I won't list all the filenames.
Diffstat (limited to 'gtk/gtktext.c')
| -rw-r--r-- | gtk/gtktext.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/gtk/gtktext.c b/gtk/gtktext.c index 31b83d427..243e7fd1d 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -553,7 +553,6 @@ gtk_text_class_init (GtkTextClass *class) widget_class->unrealize = gtk_text_unrealize; widget_class->style_set = gtk_text_style_set; widget_class->state_changed = gtk_text_state_changed; - widget_class->draw_focus = gtk_text_draw_focus; widget_class->size_request = gtk_text_size_request; widget_class->size_allocate = gtk_text_size_allocate; widget_class->expose_event = gtk_text_expose; @@ -1692,7 +1691,7 @@ gtk_text_expose (GtkWidget *widget, else if (event->count == 0) { TDEBUG (("in gtk_text_expose (focus)\n")); - gtk_widget_draw_focus (widget); + gtk_text_draw_focus (widget); } return FALSE; @@ -2228,17 +2227,12 @@ gtk_text_focus_in (GtkWidget *widget, TDEBUG (("in gtk_text_focus_in\n")); - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); - gtk_widget_draw_focus (widget); - #ifdef USE_XIM if (GTK_OLD_EDITABLE (widget)->ic) gdk_im_begin (GTK_OLD_EDITABLE (widget)->ic, GTK_TEXT(widget)->text_area); #endif - draw_cursor (GTK_TEXT(widget), TRUE); - - return FALSE; + return (* GTK_WIDGET_CLASS (parent_class)->focus_in_event) (widget, event); } static gint @@ -2251,16 +2245,11 @@ gtk_text_focus_out (GtkWidget *widget, TDEBUG (("in gtk_text_focus_out\n")); - GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); - gtk_widget_draw_focus (widget); - - undraw_cursor (GTK_TEXT(widget), TRUE); - #ifdef USE_XIM gdk_im_end (); #endif - - return FALSE; + + return (* GTK_WIDGET_CLASS (parent_class)->focus_out_event) (widget, event); } static void |