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.

1 files changed, 0 insertions, 41 deletions

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 07e2ee743..4574cfe8f 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -286,9 +286,6 @@ static void gtk_style_shade (GdkColor *a, GdkColor *b, gdouble k);
 static void rgb_to_hls (gdouble *r, gdouble *g, gdouble *b);
 static void hls_to_rgb (gdouble *h, gdouble *l, gdouble *s);
 
-static void gtk_reset_window_and_children(GtkWidget *widget, 
-					  GdkWindow *window);
-
 
 GtkStyleClass default_class =
 {
@@ -330,44 +327,6 @@ static GdkColor gtk_default_prelight_bg =    { 0, 0xea60, 0xea60, 0xea60 };
 static GdkColor gtk_default_selected_bg =    { 0,      0,      0, 0x9c40 };
 static GdkColor gtk_default_insensitive_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 };
 
-static void
-gtk_reset_window_and_children(GtkWidget *widget, GdkWindow *window)
-{
-  GdkWindowPrivate *private;
-  guint i, num;
-  GList *list;
-  gpointer data;
-  
-  g_return_if_fail (window != NULL);
-  
-  private = (GdkWindowPrivate *)window;
-
-  if (private->destroyed)
-    return;
-  gdk_window_get_user_data(window, &data);
-  if ((data) && (data != widget))
-    return;
-  gdk_window_shape_combine_mask(window, NULL, 0, 0);
-  if (private->children)
-    {
-      num = g_list_length(private->children);
-      for(i = 0; i < num; i++)
-	{
-	  list = g_list_nth(private->children, i);
-	  gtk_reset_window_and_children(widget, (GdkWindow *)list->data);
-	}
-    }
-}
-
-void
-gtk_reset_widget_shapes(GtkWidget *widget)
-{
-  g_return_if_fail (widget != NULL);
-
-  if (!GTK_WIDGET_HAS_SHAPE_MASK(GTK_OBJECT(widget)))
-    gtk_reset_window_and_children(widget, widget->window);
-}
-
 GtkStyle*
 gtk_style_copy (GtkStyle     *style)
 {