AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove gtk_widget_reset_shapes

Browse Source 
See bug 637155.
This commit is contained in:
Matthias Clasen 2010-12-14 22:15:33 -05:00
parent f9ed6baeb4
commit b7fd6f1e88
4 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gtk/gtk3-sections.txt
View File

@ -4868,7 +4868,6 @@ gtk_widget_pop_composite_child
gtk_widget_push_composite_child
gtk_widget_queue_draw_area
gtk_widget_queue_draw_region
gtk_widget_reset_shapes
gtk_widget_set_app_paintable
gtk_widget_set_double_buffered
gtk_widget_set_redraw_on_allocate

1
gtk/gtk.symbols
View File

@ -3470,7 +3470,6 @@ gtk_widget_render_icon
gtk_widget_render_icon_pixbuf
gtk_widget_reparent
gtk_widget_reset_rc_styles
gtk_widget_reset_shapes
gtk_widget_reset_style
gtk_widget_send_expose
gtk_widget_send_focus_change

41
gtk/gtkwidget.c
View File

@ -8439,10 +8439,7 @@ gtk_widget_set_style_internal (GtkWidget *widget,
GtkStyle *previous_style;
if (gtk_widget_get_realized (widget))
{
gtk_widget_reset_shapes (widget);
gtk_style_detach (priv->style);
}
gtk_style_detach (priv->style);
previous_style = priv->style;
priv->style = style;
@ -11228,42 +11225,6 @@ gtk_widget_input_shape_combine_region (GtkWidget *widget,
}
static void
gtk_reset_shapes_recurse (GtkWidget *widget,
GdkWindow *window)
{
gpointer data;
GList *list;
gdk_window_get_user_data (window, &data);
if (data != widget)
return;
gdk_window_shape_combine_region (window, NULL, 0, 0);
for (list = gdk_window_peek_children (window); list; list = list->next)
gtk_reset_shapes_recurse (widget, list->data);
}
/**
* gtk_widget_reset_shapes:
* @widget: a #GtkWidget
*
* Recursively resets the shape on this widget and its descendants.
**/
void
gtk_widget_reset_shapes (GtkWidget *widget)
{
GtkWidgetPrivate *priv;
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (gtk_widget_get_realized (widget));
priv = widget->priv;
if (!priv->has_shape_mask)
gtk_reset_shapes_recurse (widget, priv->window);
}
/* style properties
*/

3
gtk/gtkwidget.h
View File

@ -900,9 +900,6 @@ void gtk_widget_shape_combine_region (GtkWidget *widget,
void gtk_widget_input_shape_combine_region (GtkWidget *widget,
cairo_region_t *region);
/* internal function */
void gtk_widget_reset_shapes (GtkWidget *widget);
GList* gtk_widget_list_mnemonic_labels (GtkWidget *widget);
void gtk_widget_add_mnemonic_label (GtkWidget *widget,
GtkWidget *label);