diff options
author | Havoc Pennington <hp@pobox.com> | 2000-12-04 01:15:37 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2000-12-04 01:15:37 +0000 |
commit | 5995baabef8988cbb5d6f9f01d8731f069f79524 (patch) | |
tree | a54cf207dca23815ff7698256a47b4986801c37e /gtk/gtkhscale.c | |
parent | b18bb07b2d825d3788ab30f955a2fe2c6ad2915a (diff) | |
download | gdk-pixbuf-5995baabef8988cbb5d6f9f01d8731f069f79524.tar.gz |
Remove "draw" virtual method and signal
2000-12-02 Havoc Pennington <hp@pobox.com>
* 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
Diffstat (limited to 'gtk/gtkhscale.c')
-rw-r--r-- | gtk/gtkhscale.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index c8442fb70..67ab9f4c7 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -62,8 +62,6 @@ static void gtk_hscale_pos_background (GtkHScale *hscale, gint *h); static void gtk_hscale_draw_slider (GtkRange *range); static void gtk_hscale_draw_value (GtkScale *scale); -static void gtk_hscale_draw (GtkWidget *widget, - GdkRectangle *area); static gint gtk_hscale_trough_keys (GtkRange *range, GdkEventKey *key, GtkScrollType *scroll, @@ -119,7 +117,6 @@ gtk_hscale_class_init (GtkHScaleClass *class) widget_class->realize = gtk_hscale_realize; widget_class->size_request = gtk_hscale_size_request; widget_class->size_allocate = gtk_hscale_size_allocate; - widget_class->draw = gtk_hscale_draw; range_class->slider_update = gtk_range_default_hslider_update; range_class->trough_click = gtk_range_default_htrough_click; @@ -250,50 +247,6 @@ gtk_hscale_realize (GtkWidget *widget) gdk_window_show (range->slider); } -static void -gtk_hscale_draw (GtkWidget *widget, - GdkRectangle *area) -{ - GtkRange *range; - GdkRectangle tmp_area; - GdkRectangle child_area; - gint x, y, width, height; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_RANGE (widget)); - g_return_if_fail (area != NULL); - - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) - { - range = GTK_RANGE (widget); - - gtk_hscale_pos_background (GTK_HSCALE (widget), &x, &y, &width, &height); - - tmp_area.x = x; - tmp_area.y = y; - tmp_area.width = width; - tmp_area.height = height; - - if (gdk_rectangle_intersect (area, &tmp_area, &child_area)) - gtk_range_draw_background (range); - - gtk_hscale_pos_trough (GTK_HSCALE (widget), &x, &y, &width, &height); - - tmp_area.x = x; - tmp_area.y = y; - tmp_area.width = width; - tmp_area.height = height; - - if (gdk_rectangle_intersect (area, &tmp_area, &child_area)) - { - gtk_range_draw_trough (range); - gtk_range_draw_slider (range); - gtk_range_draw_step_forw (range); - gtk_range_draw_step_back (range); - } - } -} - static void gtk_hscale_clear_background (GtkRange *range) { |