theme: Scrap meta_theme_draw_frame

The more public symbols we remove, the closer we get to
not supporting the legacy theme API at all...
This commit is contained in:
Jasper St. Pierre
2012-05-05 00:00:47 -03:00
parent 5053997021
commit 25815473e6
4 changed files with 23 additions and 57 deletions

View File

@@ -177,12 +177,13 @@ meta_preview_draw (GtkWidget *widget,
if (client_height < 0) if (client_height < 0)
client_height = 1; client_height = 1;
meta_theme_draw_frame (preview->theme, meta_theme_draw_frame_with_style (preview->theme,
widget, gtk_widget_get_style_context (widget),
cr, cr,
preview->type, preview->type,
preview->flags, preview->flags,
client_width, client_height, client_width,
client_height,
preview->layout, preview->layout,
&preview->button_layout, &preview->button_layout,
button_states, button_states,

View File

@@ -1007,19 +1007,6 @@ void meta_theme_render_background (GtkStyleContext *style,
const MetaFrameGeometry *fgeom, const MetaFrameGeometry *fgeom,
PangoLayout *title_layout); PangoLayout *title_layout);
void meta_theme_draw_frame (MetaTheme *theme,
GtkWidget *widget,
cairo_t *cr,
MetaFrameType type,
MetaFrameFlags flags,
int client_width,
int client_height,
PangoLayout *title_layout,
const MetaButtonLayout *button_layout,
MetaButtonState button_states[META_BUTTON_TYPE_LAST],
GdkPixbuf *mini_icon,
GdkPixbuf *icon);
void meta_theme_draw_frame_with_style (MetaTheme *theme, void meta_theme_draw_frame_with_style (MetaTheme *theme,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
cairo_t *cr, cairo_t *cr,

View File

@@ -1006,8 +1006,8 @@ run_theme_benchmark (void)
cr = cairo_create (pixmap); cr = cairo_create (pixmap);
meta_theme_draw_frame (global_theme, meta_theme_draw_frame_with_style (global_theme,
widget, gtk_widget_get_style_context (widget),
cr, cr,
META_FRAME_TYPE_NORMAL, META_FRAME_TYPE_NORMAL,
get_flags (widget), get_flags (widget),

View File

@@ -5054,28 +5054,6 @@ meta_theme_draw_frame_with_style (MetaTheme *theme,
mini_icon, icon); mini_icon, icon);
} }
void
meta_theme_draw_frame (MetaTheme *theme,
GtkWidget *widget,
cairo_t *cr,
MetaFrameType type,
MetaFrameFlags flags,
int client_width,
int client_height,
PangoLayout *title_layout,
const MetaButtonLayout *button_layout,
MetaButtonState button_states[META_BUTTON_TYPE_LAST],
GdkPixbuf *mini_icon,
GdkPixbuf *icon)
{
meta_theme_draw_frame_with_style (theme, gtk_widget_get_style_context (widget),
cr, type,flags,
client_width, client_height,
title_layout,
button_layout, button_states,
mini_icon, icon);
}
void void
meta_theme_get_frame_borders (MetaTheme *theme, meta_theme_get_frame_borders (MetaTheme *theme,
GtkStyleContext *style_context, GtkStyleContext *style_context,