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

widget: Remove unused draw_internal prototype

Browse Source 
gtk_widget_draw_internal is now only used inside gtkwidget.c, so remove
the prototype from gtkwidgetprivate.h. And since all incovacations call
it with clip_to_size=TRUE, remove that parameter.
This commit is contained in:
Timm Bäder 2017-08-21 12:40:41 +02:00
parent 82f20efc2c
commit 8e0ed691e3
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkwidget.c
View File

@ -6284,23 +6284,19 @@ get_render_mode (GtkWidgetClass *klass)
return RENDER_SNAPSHOT;
}
void
static void
gtk_widget_draw_internal (GtkWidget *widget,
cairo_t *cr,
gboolean clip_to_size)
cairo_t *cr)
{
if (!_gtk_widget_is_drawable (widget))
return;
if (clip_to_size)
{
cairo_rectangle (cr,
widget->priv->clip.x - widget->priv->allocation.x,
widget->priv->clip.y - widget->priv->allocation.y,
widget->priv->clip.width,
widget->priv->clip.height);
cairo_clip (cr);
}
cairo_rectangle (cr,
widget->priv->clip.x - widget->priv->allocation.x,
widget->priv->clip.y - widget->priv->allocation.y,
widget->priv->clip.width,
widget->priv->clip.height);
cairo_clip (cr);
if (gdk_cairo_get_clip_rectangle (cr, NULL))
{
@ -6457,7 +6453,7 @@ gtk_widget_draw (GtkWidget *widget,
cairo_save (cr);
gtk_widget_draw_internal (widget, cr, TRUE);
gtk_widget_draw_internal (widget, cr);
cairo_restore (cr);
}
@ -15159,7 +15155,7 @@ gtk_widget_snapshot (GtkWidget *widget,
cr = gtk_snapshot_append_cairo (snapshot,
&bounds, "Fallback<%s>",
G_OBJECT_TYPE_NAME (widget));
gtk_widget_draw_internal (widget, cr, TRUE);
gtk_widget_draw_internal (widget, cr);
cairo_destroy (cr);
}
else

3
gtk/gtkwidgetprivate.h
View File

@ -179,9 +179,6 @@ gboolean _gtk_widget_get_alloc_needed (GtkWidget *widget);
gboolean gtk_widget_needs_allocate (GtkWidget *widget);
void gtk_widget_ensure_resize (GtkWidget *widget);
void gtk_widget_ensure_allocate (GtkWidget *widget);
void gtk_widget_draw_internal (GtkWidget *widget,
cairo_t *cr,
gboolean do_clip);
void _gtk_widget_scale_changed (GtkWidget *widget);