diff options
| author | Tim Janik <timj@gtk.org> | 1998-11-28 07:42:37 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-11-28 07:42:37 +0000 |
| commit | 238ede333fb92750520071b71ebff7130b4c8803 (patch) | |
| tree | e53ab2172e6542b6c65d90b25e57823475a82202 /gtk/gtkbin.c | |
| parent | 67d445eebc8d350f5a5131dc6e3d7b8d8ef9da13 (diff) | |
| download | gtk+-238ede333fb92750520071b71ebff7130b4c8803.tar.gz | |
changed scrolled window inheritance, it inherits from GtkBin now.
Sat Nov 28 03:13:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c: changed scrolled window inheritance,
it inherits from GtkBin now.
* gtk/gtkbin.c (gtk_bin_unmap): removed superfluous check for
visibility of child.
(gtk_bin_draw): removed superfluous check for GTK_WIDGET_DRAWABLE().
added check so a child gets only drawn if it's visible.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: removed gtk_widget_draw_children().
* gtk/gtkstyle.h:
* gtk/gtkstyle.c: rmoved gtk_reset_widget_shapes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: removed crufty relict: gtk_widget_is_child().
added internal function gtk_widget_reset_shapes() from gtkstyle.c.
* gtk/gtkrc.h:
* gtk/gtkrc.c: (gtk_rc_find_pixmap_in_path): removed bogus gscanner
argument, changed callers.
* gtk/gtkmenufactory.c: GtkMenuFactory is deprecated for a long time,
it will issue a warning now.
* gtk/gtkcompat.h: new file to #define aliases for historic
function names.
* changed 8 function names for consistency and provided aliases to keep
source compatibility in gtkcompat.h:
(gtk_accel_label_get_accel_width): renamed from gtk_accel_label_accelerator_width
(gtk_container_set_border_width): renamed from gtk_container_border_width
(gtk_notebook_get_current_page): renamed from gtk_notebook_current_page
(gtk_packer_configure): renamed from gtk_packer_set_child_packing
(gtk_paned_set_gutter_size): renamed from gtk_paned_gutter_size
(gtk_paned_set_handle_size): renamed from gtk_paned_handle_size
(gtk_scale_get_value_width): renamed from gtk_scale_value_width
(gtk_window_set_position): renamed from gtk_window_position
* renamed a few recently added funtions for consistency:
(gtk_notebook_get_tab_label): renamed from gtk_notebook_query_tab_label.
(gtk_notebook_get_menu_label): renamed from gtk_notebook_query_menu_label.
(gtk_progress_configure): renamed from gtk_progress_reconfigure.
Diffstat (limited to 'gtk/gtkbin.c')
| -rw-r--r-- | gtk/gtkbin.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index e3bdab1fcc..feff474b68 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -146,9 +146,7 @@ gtk_bin_unmap (GtkWidget *widget) else gdk_window_hide (widget->window); - if (bin->child && - GTK_WIDGET_VISIBLE (bin->child) && - GTK_WIDGET_MAPPED (bin->child)) + if (bin->child && GTK_WIDGET_MAPPED (bin->child)) gtk_widget_unmap (bin->child); } @@ -162,14 +160,11 @@ gtk_bin_draw (GtkWidget *widget, g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_BIN (widget)); - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) - { - bin = GTK_BIN (widget); - - if (bin->child && - gtk_widget_intersect (bin->child, area, &child_area)) - gtk_widget_draw (bin->child, &child_area); - } + bin = GTK_BIN (widget); + + if (bin->child && GTK_WIDGET_VISIBLE (bin->child) && + gtk_widget_intersect (bin->child, area, &child_area)) + gtk_widget_draw (bin->child, &child_area); } static gint |