From 5995baabef8988cbb5d6f9f01d8731f069f79524 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 4 Dec 2000 01:15:37 +0000 Subject: Remove "draw" virtual method and signal 2000-12-02 Havoc Pennington * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove "draw" virtual method and signal * gtk/gtkwidget.c (gtk_widget_draw): Now just queues a draw then calls gdk_window_process_updates() to push the exposes through (gtk_widget_class_init): No more draw signal, no gtk_widget_real_draw() * gtk/gtkbin.c (gtk_bin_draw): remove * gtk/gtkbox.c (gtk_box_draw): remove * gtk/gtkbutton.c (gtk_button_draw): remove * gtk/gtkcalendar.c (gtk_calendar_draw): remove * gtk/gtkcheckbutton.c (gtk_check_button_draw): remove * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_draw): remove * gtk/gtkclist.c (gtk_clist_draw): remove * gtk/gtkentry.c (gtk_entry_draw): remove * gtk/gtkeventbox.c (gtk_event_box_draw): remove * gtk/gtkfixed.c (gtk_fixed_draw): remove * gtk/gtkframe.c (gtk_frame_draw): remove * gtk/gtkhandlebox.c (gtk_handle_box_draw): remove * gtk/gtkhpaned.c (gtk_hpaned_draw): remove * gtk/gtklayout.c (gtk_layout_draw): remove * gtk/gtklist.c (gtk_list_draw): remove * gtk/gtklistitem.c (gtk_list_item_draw): remove * gtk/gtkmenu.c (gtk_menu_draw): remove * gtk/gtkmenubar.c (gtk_menu_bar_draw): remove * gtk/gtkmenuitem.c (gtk_menu_item_draw): remove * gtk/gtknotebook.c (gtk_notebook_draw): remove * gtk/gtkoptionmenu.c (gtk_option_menu_draw): remove * gtk/gtkpacker.c (gtk_packer_draw): remove * gtk/gtkrange.c (gtk_range_draw): remove * gtk/gtkscrolledwindow.c (gtk_scrolled_window_draw): remove * gtk/gtkspinbutton.c (gtk_spin_button_draw): remove * gtk/gtktable.c (gtk_table_draw): remove * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_draw): remove * gtk/gtktext.c (gtk_text_draw): remove * gtk/gtktextview.c (gtk_text_view_draw): remove * gtk/gtktogglebutton.c (gtk_toggle_button_draw): remove * gtk/gtktoolbar.c (gtk_toolbar_draw): remove * gtk/gtktree.c (gtk_tree_draw): remove * gtk/gtktreeitem.c (gtk_tree_item_draw): remove * gtk/gtktreeview.c (gtk_tree_view_draw): remove * gtk/gtkviewport.c (gtk_viewport_draw): remove * gtk/gtkvpaned.c (gtk_vpaned_draw): remove * gtk/gtkvscale.c (gtk_vscale_draw): remove * gtk/gtkwindow.c (gtk_window_draw): remove --- gtk/gtkcheckbutton.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'gtk/gtkcheckbutton.c') diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 219060ae79..681082d7ec 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -34,8 +34,6 @@ static void gtk_check_button_class_init (GtkCheckButtonClass *klass); static void gtk_check_button_init (GtkCheckButton *check_button); -static void gtk_check_button_draw (GtkWidget *widget, - GdkRectangle *area); static void gtk_check_button_draw_focus (GtkWidget *widget); static void gtk_check_button_size_request (GtkWidget *widget, GtkRequisition *requisition); @@ -86,7 +84,6 @@ gtk_check_button_class_init (GtkCheckButtonClass *class) widget_class = (GtkWidgetClass*) class; parent_class = gtk_type_class (gtk_toggle_button_get_type ()); - widget_class->draw = gtk_check_button_draw; widget_class->draw_focus = gtk_check_button_draw_focus; widget_class->size_request = gtk_check_button_size_request; widget_class->size_allocate = gtk_check_button_size_allocate; @@ -159,40 +156,6 @@ gtk_check_button_paint (GtkWidget *widget, } } -static void -gtk_check_button_draw (GtkWidget *widget, - GdkRectangle *area) -{ - GtkCheckButton *check_button; - GtkToggleButton *toggle_button; - GtkBin *bin; - GdkRectangle child_area; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_CHECK_BUTTON (widget)); - g_return_if_fail (area != NULL); - - check_button = GTK_CHECK_BUTTON (widget); - toggle_button = GTK_TOGGLE_BUTTON (widget); - bin = GTK_BIN (widget); - - if (GTK_WIDGET_DRAWABLE (widget)) - { - if (toggle_button->draw_indicator) - { - gtk_check_button_paint (widget, area); - - if (bin->child && gtk_widget_intersect (bin->child, area, &child_area)) - gtk_widget_draw (bin->child, &child_area); - } - else - { - if (GTK_WIDGET_CLASS (parent_class)->draw) - (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area); - } - } -} - static void gtk_check_button_draw_focus (GtkWidget *widget) { -- cgit v1.2.1