From 623966b6daa049fb912be19716ebc8ce1509a1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 24 Apr 2010 04:12:03 +0200 Subject: [PATCH] Remove all gtk_draw_* deprecated functions completely --- docs/reference/gtk/gtk-sections.txt | 21 -- docs/reference/gtk/tmpl/gtkstyle.sgml | 314 -------------------------- gtk/gtkstyle.c | 62 ----- 3 files changed, 397 deletions(-) diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 40bafecdd2..835f4a62cf 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -5774,27 +5774,6 @@ gtk_style_set_font gtk_style_get_style_property gtk_style_get_valist gtk_style_get -gtk_draw_hline -gtk_draw_vline -gtk_draw_shadow -gtk_draw_polygon -gtk_draw_arrow -gtk_draw_diamond -gtk_draw_string -gtk_draw_box -gtk_draw_box_gap -gtk_draw_check -gtk_draw_extension -gtk_draw_flat_box -gtk_draw_focus -gtk_draw_handle -gtk_draw_option -gtk_draw_shadow_gap -gtk_draw_slider -gtk_draw_tab -gtk_draw_expander -gtk_draw_layout -gtk_draw_resize_grip gtk_paint_arrow gtk_paint_box gtk_paint_box_gap diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml index 22cad1176b..ffe567106d 100644 --- a/docs/reference/gtk/tmpl/gtkstyle.sgml +++ b/docs/reference/gtk/tmpl/gtkstyle.sgml @@ -250,320 +250,6 @@ Does the same as gtk_style_apply_default_background(). @Varargs: - - - - - -@style: -@window: -@state_type: -@x1: -@x2: -@y: - - - - - - - -@style: -@window: -@state_type: -@y1_: -@y2_: -@x: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@points: -@npoints: -@fill: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@arrow_type: -@fill: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@state_type: -@x: -@y: -@string: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: -@gap_side: -@gap_x: -@gap_width: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: -@gap_side: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: -@orientation: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: -@gap_side: -@gap_x: -@gap_width: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: -@orientation: - - - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - - - - - - -@style: -@window: -@state_type: -@x: -@y: -@expander_style: - - - - - - - -@style: -@window: -@state_type: -@use_text: -@x: -@y: -@layout: - - - - - - - -@style: -@window: -@state_type: -@edge: -@x: -@y: -@width: -@height: - - diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index ac49234952..53c4711f90 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -919,68 +919,6 @@ gtk_style_lookup_color (GtkStyle *style, return FALSE; } -/** - * gtk_draw_slider: - * @style: a #GtkStyle - @window: a #GdkWindow - * @state_type: a state - * @shadow_type: a shadow - * @x: the x origin of the rectangle in which to draw a slider - * @y: the y origin of the rectangle in which to draw a slider - * @width: the width of the rectangle in which to draw a slider - * @height: the height of the rectangle in which to draw a slider - * @orientation: the orientation to be used - * - * Draws a slider in the given rectangle on @window using the - * given style and orientation. - */ -void -gtk_draw_slider (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GtkShadowType shadow_type, - gint x, - gint y, - gint width, - gint height, - GtkOrientation orientation) -{ - g_return_if_fail (GTK_IS_STYLE (style)); - g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL); - - GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, orientation); -} - -/** - * gtk_draw_layout: - * @style: a #GtkStyle - * @window: a #GdkWindow - * @state_type: a state - * @use_text: whether to use the text or foreground - * graphics context of @style - * @x: x origin - * @y: y origin - * @layout: the layout to draw - * - * Draws a layout on @window using the given parameters. - */ -void -gtk_draw_layout (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - gboolean use_text, - gint x, - gint y, - PangoLayout *layout) -{ - g_return_if_fail (GTK_IS_STYLE (style)); - g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL); - - GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text, - NULL, NULL, NULL, - x, y, layout); -} - /** * gtk_style_set_background: * @style: a #GtkStyle