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.

1 files changed, 2 insertions, 47 deletions

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index debb603e37..a9fa8ad1a1 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -284,10 +284,6 @@ static gint gtk_calendar_leave_notify	(GtkWidget *widget,
 					 GdkEventCrossing *event);
 static gint gtk_calendar_key_press	(GtkWidget	   *widget,
 					 GdkEventKey	   *event);
-static gint gtk_calendar_focus_in	(GtkWidget *widget,
-					 GdkEventFocus *event);
-static gint gtk_calendar_focus_out	(GtkWidget *widget,
-					 GdkEventFocus *event);
 static void gtk_calendar_state_changed	(GtkWidget *widget,
 					 GtkStateType previous_state);
 static void gtk_calendar_style_set	(GtkWidget *widget,
@@ -358,7 +354,6 @@ gtk_calendar_class_init (GtkCalendarClass *class)
   widget_class->realize = gtk_calendar_realize;
   widget_class->unrealize = gtk_calendar_unrealize;
   widget_class->expose_event = gtk_calendar_expose;
-  widget_class->draw_focus = gtk_calendar_draw_focus;
   widget_class->size_request = gtk_calendar_size_request;
   widget_class->size_allocate = gtk_calendar_size_allocate;
   widget_class->button_press_event = gtk_calendar_button_press;
@@ -366,8 +361,6 @@ gtk_calendar_class_init (GtkCalendarClass *class)
   widget_class->enter_notify_event = gtk_calendar_enter_notify;
   widget_class->leave_notify_event = gtk_calendar_leave_notify;
   widget_class->key_press_event = gtk_calendar_key_press;
-  widget_class->focus_in_event = gtk_calendar_focus_in;
-  widget_class->focus_out_event = gtk_calendar_focus_out;
   widget_class->style_set = gtk_calendar_style_set;
   widget_class->state_changed = gtk_calendar_state_changed;
   
@@ -1484,7 +1477,7 @@ gtk_calendar_expose (GtkWidget	    *widget,
       if (event->window == private_data->week_win)
 	gtk_calendar_paint_week_numbers (widget);
       if (event->window == widget->window)
-	gtk_widget_draw_focus (widget);
+	gtk_calendar_draw_focus (widget);
     }
   
   return FALSE;
@@ -1516,7 +1509,7 @@ gtk_calendar_paint (GtkWidget	 *widget,
   if (private_data->week_win != NULL)
     gtk_calendar_paint_week_numbers (widget);
   
-  gtk_widget_draw_focus (widget);
+  gtk_calendar_draw_focus (widget);
 }
 
 static void
@@ -2622,25 +2615,6 @@ gtk_calendar_state_changed (GtkWidget	   *widget,
   gtk_calendar_set_background (widget);
 }
 
-static gint
-gtk_calendar_focus_in (GtkWidget	 *widget,
-		       GdkEventFocus	 *event)
-{
-  GtkCalendar *calendar;
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  calendar = GTK_CALENDAR (widget);
-  
-  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-  gtk_widget_draw_focus (widget);
-  gtk_calendar_paint_day (widget, calendar->focus_row, calendar->focus_col);
-  
-  return FALSE;
-}
-
 static void
 gtk_calendar_destroy (GtkObject *object)
 {
@@ -2652,25 +2626,6 @@ gtk_calendar_destroy (GtkObject *object)
 }
 
 static gint
-gtk_calendar_focus_out (GtkWidget	  *widget,
-			GdkEventFocus	  *event)
-{
-  GtkCalendar *calendar;
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_CALENDAR (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  calendar = GTK_CALENDAR (widget);
-  
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-  gtk_widget_draw_focus (widget);
-  gtk_calendar_paint_day (widget, calendar->focus_row, calendar->focus_col);
-  
-  return FALSE;
-}
-
-static gint
 gtk_calendar_key_press (GtkWidget   *widget,
 			GdkEventKey *event)
 {