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/gtkrange.c | |
| parent | c82dc58f7fceed9878181b50783ebfc80a5a3ae8 (diff) | |
| download | gtk+-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/gtkrange.c')
| -rw-r--r-- | gtk/gtkrange.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 76d88cd78a..2ffcc963b5 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -49,7 +49,6 @@ static void gtk_range_get_arg (GtkObject *object, GtkArg *arg, guint arg_id); static void gtk_range_destroy (GtkObject *object); -static void gtk_range_draw_focus (GtkWidget *widget); static void gtk_range_unrealize (GtkWidget *widget); static gint gtk_range_expose (GtkWidget *widget, GdkEventExpose *event); @@ -65,10 +64,6 @@ static gint gtk_range_enter_notify (GtkWidget *widget, GdkEventCrossing *event); static gint gtk_range_leave_notify (GtkWidget *widget, GdkEventCrossing *event); -static gint gtk_range_focus_in (GtkWidget *widget, - GdkEventFocus *event); -static gint gtk_range_focus_out (GtkWidget *widget, - GdkEventFocus *event); static gint gtk_range_scroll_event (GtkWidget *widget, GdkEventScroll *event); static void gtk_range_style_set (GtkWidget *widget, @@ -138,7 +133,6 @@ gtk_range_class_init (GtkRangeClass *class) object_class->get_arg = gtk_range_get_arg; object_class->destroy = gtk_range_destroy; - widget_class->draw_focus = gtk_range_draw_focus; widget_class->unrealize = gtk_range_unrealize; widget_class->expose_event = gtk_range_expose; widget_class->button_press_event = gtk_range_button_press; @@ -148,8 +142,6 @@ gtk_range_class_init (GtkRangeClass *class) widget_class->key_press_event = gtk_range_key_press; widget_class->enter_notify_event = gtk_range_enter_notify; widget_class->leave_notify_event = gtk_range_leave_notify; - widget_class->focus_in_event = gtk_range_focus_in; - widget_class->focus_out_event = gtk_range_focus_out; widget_class->style_set = gtk_range_style_set; class->slider_width = 11; @@ -798,16 +790,6 @@ gtk_range_destroy (GtkObject *object) } static void -gtk_range_draw_focus (GtkWidget *widget) -{ - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_RANGE (widget)); - - if (GTK_WIDGET_DRAWABLE (widget)) - _gtk_range_draw_trough (GTK_RANGE (widget)); -} - -static void gtk_range_unrealize (GtkWidget *widget) { GtkRange *range; @@ -1272,32 +1254,6 @@ gtk_range_leave_notify (GtkWidget *widget, return TRUE; } -static gint -gtk_range_focus_in (GtkWidget *widget, - GdkEventFocus *event) -{ - g_return_val_if_fail (GTK_IS_RANGE (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); - gtk_widget_draw_focus (widget); - - return TRUE; -} - -static gint -gtk_range_focus_out (GtkWidget *widget, - GdkEventFocus *event) -{ - g_return_val_if_fail (GTK_IS_RANGE (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); - gtk_widget_draw_focus (widget); - - return TRUE; -} - static void gtk_real_range_draw_trough (GtkRange *range) { |