Commit 2c25bd85 authored by Matthias Clasen's avatar Matthias Clasen

gtk: Use versioned deprecations

This patch changes all uses of GDK_DEPRECATED(_FOR) in gtk headers
by the versioned variants, GDK_DEPRECATED_IN_3_x(_FOR). At the same
time, we add GDK_AVAILABLE_IN_3_x annotations for all API additions
in 3.2 and 3.4.
parent 98f34681
......@@ -89,67 +89,67 @@ struct _GtkColorSelectionClass
/* ColorSelection */
GType gtk_color_selection_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_color_chooser_widget_new)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_widget_new)
GtkWidget *gtk_color_selection_new (void);
GDK_DEPRECATED_FOR(gtk_color_chooser_get_use_alpha)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_use_alpha)
gboolean gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel);
GDK_DEPRECATED_FOR(gtk_color_chooser_set_use_alpha)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_use_alpha)
void gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel,
gboolean has_opacity);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
gboolean gtk_color_selection_get_has_palette (GtkColorSelection *colorsel);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_set_has_palette (GtkColorSelection *colorsel,
gboolean has_palette);
GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
void gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel,
guint16 alpha);
GDK_DEPRECATED_FOR(gtk_color_chooser_get_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
guint16 gtk_color_selection_get_current_alpha (GtkColorSelection *colorsel);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_set_previous_alpha (GtkColorSelection *colorsel,
guint16 alpha);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
guint16 gtk_color_selection_get_previous_alpha (GtkColorSelection *colorsel);
GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
void gtk_color_selection_set_current_rgba (GtkColorSelection *colorsel,
const GdkRGBA *rgba);
GDK_DEPRECATED_FOR(gtk_color_chooser_get_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
void gtk_color_selection_get_current_rgba (GtkColorSelection *colorsel,
GdkRGBA *rgba);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_set_previous_rgba (GtkColorSelection *colorsel,
const GdkRGBA *rgba);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_get_previous_rgba (GtkColorSelection *colorsel,
GdkRGBA *rgba);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
gboolean gtk_color_selection_is_adjusting (GtkColorSelection *colorsel);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
gboolean gtk_color_selection_palette_from_string (const gchar *str,
GdkColor **colors,
gint *n_colors);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
gchar* gtk_color_selection_palette_to_string (const GdkColor *colors,
gint n_colors);
GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);
GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
void gtk_color_selection_set_current_color (GtkColorSelection *colorsel,
const GdkColor *color);
GDK_DEPRECATED_FOR(gtk_color_chooser_get_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_rgba)
void gtk_color_selection_get_current_color (GtkColorSelection *colorsel,
GdkColor *color);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_set_previous_color (GtkColorSelection *colorsel,
const GdkColor *color);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_color_selection_get_previous_color (GtkColorSelection *colorsel,
GdkColor *color);
......
......@@ -71,9 +71,9 @@ struct _GtkColorSelectionDialogClass
/* ColorSelectionDialog */
GType gtk_color_selection_dialog_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_color_chooser_dialog_new)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_dialog_new)
GtkWidget* gtk_color_selection_dialog_new (const gchar *title);
GDK_DEPRECATED_FOR(GtkColorChooser)
GDK_DEPRECATED_IN_3_4_FOR(GtkColorChooser)
GtkWidget* gtk_color_selection_dialog_get_color_selection (GtkColorSelectionDialog *colorsel);
......
......@@ -106,58 +106,58 @@ struct _GtkFontSelectionDialogClass
};
GType gtk_font_selection_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_new (void);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_family_list (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_face_list (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_size_entry (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_size_list (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_get_preview_entry (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
PangoFontFamily *
gtk_font_selection_get_family (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
PangoFontFace *
gtk_font_selection_get_face (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
gint gtk_font_selection_get_size (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
gchar* gtk_font_selection_get_font_name (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
const gchar *fontname);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
const gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
const gchar *text);
GType gtk_font_selection_dialog_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_new (const gchar *title);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_get_ok_button (GtkFontSelectionDialog *fsd);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_get_cancel_button (GtkFontSelectionDialog *fsd);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_get_font_selection (GtkFontSelectionDialog *fsd);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
gchar* gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
gboolean gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
const gchar *fontname);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
const gchar*
gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd);
GDK_DEPRECATED_FOR(GtkFontChooser)
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
void gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
const gchar *text);
......
......@@ -77,24 +77,24 @@ struct _GtkHandleBoxClass
GType gtk_handle_box_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
GtkWidget* gtk_handle_box_new (void);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_handle_box_set_shadow_type (GtkHandleBox *handle_box,
GtkShadowType type);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
GtkShadowType gtk_handle_box_get_shadow_type (GtkHandleBox *handle_box);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_handle_box_set_handle_position (GtkHandleBox *handle_box,
GtkPositionType position);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
GtkPositionType gtk_handle_box_get_handle_position(GtkHandleBox *handle_box);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_handle_box_set_snap_edge (GtkHandleBox *handle_box,
GtkPositionType edge);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
GtkPositionType gtk_handle_box_get_snap_edge (GtkHandleBox *handle_box);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
gboolean gtk_handle_box_get_child_detached (GtkHandleBox *handle_box);
G_END_DECLS
......
......@@ -59,7 +59,7 @@ struct _GtkHButtonBoxClass
GType gtk_hbutton_box_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_button_box_new)
GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new)
GtkWidget* gtk_hbutton_box_new (void);
G_END_DECLS
......
......@@ -60,7 +60,7 @@ struct _GtkHBoxClass
GType gtk_hbox_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_box_new)
GDK_DEPRECATED_IN_3_2_FOR(gtk_box_new)
GtkWidget * gtk_hbox_new (gboolean homogeneous,
gint spacing);
......
......@@ -58,7 +58,7 @@ struct _GtkHPanedClass
GType gtk_hpaned_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_paned_new)
GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new)
GtkWidget * gtk_hpaned_new (void);
G_END_DECLS
......
......@@ -58,9 +58,9 @@ struct _GtkHScaleClass
GType gtk_hscale_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_scale_new)
GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new)
GtkWidget* gtk_hscale_new (GtkAdjustment *adjustment);
GDK_DEPRECATED_FOR(gtk_scale_new_with_range)
GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new_with_range)
GtkWidget* gtk_hscale_new_with_range (gdouble min,
gdouble max,
gdouble step);
......
......@@ -58,7 +58,7 @@ struct _GtkHScrollbarClass
GType gtk_hscrollbar_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_scrollbar_new)
GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new)
GtkWidget* gtk_hscrollbar_new (GtkAdjustment *adjustment);
G_END_DECLS
......
......@@ -58,7 +58,7 @@ struct _GtkHSeparatorClass
GType gtk_hseparator_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_separator_new)
GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new)
GtkWidget* gtk_hseparator_new (void);
G_END_DECLS
......
......@@ -80,27 +80,27 @@ struct _GtkHSVClass
GType gtk_hsv_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
GtkWidget* gtk_hsv_new (void);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_hsv_set_color (GtkHSV *hsv,
double h,
double s,
double v);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_hsv_get_color (GtkHSV *hsv,
gdouble *h,
gdouble *s,
gdouble *v);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_hsv_set_metrics (GtkHSV *hsv,
gint size,
gint ring_width);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_hsv_get_metrics (GtkHSV *hsv,
gint *size,
gint *ring_width);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
gboolean gtk_hsv_is_adjusting (GtkHSV *hsv);
G_END_DECLS
......
......@@ -145,53 +145,53 @@ gboolean _gtk_rc_match_widget_class (GSList *list,
gchar *path,
gchar *path_reversed);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_rc_add_default_file (const gchar *filename);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_rc_set_default_files (gchar **filenames);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gchar** gtk_rc_get_default_files (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkStyle* gtk_rc_get_style (GtkWidget *widget);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkStyle* gtk_rc_get_style_by_paths (GtkSettings *settings,
const char *widget_path,
const char *class_path,
GType type);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gboolean gtk_rc_reparse_all_for_settings (GtkSettings *settings,
gboolean force_load);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_rc_reset_styles (GtkSettings *settings);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gchar* gtk_rc_find_pixmap_in_path (GtkSettings *settings,
GScanner *scanner,
const gchar *pixmap_file);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_rc_parse (const gchar *filename);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_rc_parse_string (const gchar *rc_string);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gboolean gtk_rc_reparse_all (void);
GType gtk_rc_style_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkRcStyle* gtk_rc_style_new (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkRcStyle* gtk_rc_style_copy (GtkRcStyle *orig);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gchar* gtk_rc_find_module_in_path (const gchar *module_file);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gchar* gtk_rc_get_theme_dir (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gchar* gtk_rc_get_module_dir (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gchar* gtk_rc_get_im_module_path (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gchar* gtk_rc_get_im_module_file (void);
/* private functions/definitions */
......@@ -289,19 +289,19 @@ typedef enum {
GTK_RC_TOKEN_LAST
} GtkRcTokenType;
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GScanner* gtk_rc_scanner_new (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
guint gtk_rc_parse_color (GScanner *scanner,
GdkColor *color);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
guint gtk_rc_parse_color_full (GScanner *scanner,
GtkRcStyle *style,
GdkColor *color);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
guint gtk_rc_parse_state (GScanner *scanner,
GtkStateType *state);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
guint gtk_rc_parse_priority (GScanner *scanner,
GtkPathPriorityType *priority);
......
......@@ -369,20 +369,20 @@ struct _GtkStyleClass
};
GType gtk_style_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkStyle* gtk_style_new (void);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkStyle* gtk_style_copy (GtkStyle *style);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkStyle* gtk_style_attach (GtkStyle *style,
GdkWindow *window);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_style_detach (GtkStyle *style);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_style_set_background (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_style_apply_default_background (GtkStyle *style,
cairo_t *cr,
GdkWindow *window,
......@@ -392,15 +392,15 @@ void gtk_style_apply_default_background (GtkStyle *style,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkIconSet* gtk_style_lookup_icon_set (GtkStyle *style,
const gchar *stock_id);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gboolean gtk_style_lookup_color (GtkStyle *style,
const gchar *color_name,
GdkColor *color);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GdkPixbuf* gtk_style_render_icon (GtkStyle *style,
const GtkIconSource *source,
GtkTextDirection direction,
......@@ -409,7 +409,7 @@ GdkPixbuf* gtk_style_render_icon (GtkStyle *style,
GtkWidget *widget,
const gchar *detail);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_hline (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -418,7 +418,7 @@ void gtk_paint_hline (GtkStyle *style,
gint x1,
gint x2,
gint y);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_vline (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -427,7 +427,7 @@ void gtk_paint_vline (GtkStyle *style,
gint y1_,
gint y2_,
gint x);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_shadow (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -438,7 +438,7 @@ void gtk_paint_shadow (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_arrow (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -451,7 +451,7 @@ void gtk_paint_arrow (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_diamond (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -462,7 +462,7 @@ void gtk_paint_diamond (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_box (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -473,7 +473,7 @@ void gtk_paint_box (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_flat_box (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -484,7 +484,7 @@ void gtk_paint_flat_box (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_check (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -495,7 +495,7 @@ void gtk_paint_check (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_option (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -506,7 +506,7 @@ void gtk_paint_option (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_tab (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -517,7 +517,7 @@ void gtk_paint_tab (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_shadow_gap (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -531,7 +531,7 @@ void gtk_paint_shadow_gap (GtkStyle *style,
GtkPositionType gap_side,
gint gap_x,
gint gap_width);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_box_gap (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -545,7 +545,7 @@ void gtk_paint_box_gap (GtkStyle *style,
GtkPositionType gap_side,
gint gap_x,
gint gap_width);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_extension (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -557,7 +557,7 @@ void gtk_paint_extension (GtkStyle *style,
gint width,
gint height,
GtkPositionType gap_side);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_focus (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -567,7 +567,7 @@ void gtk_paint_focus (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_slider (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -579,7 +579,7 @@ void gtk_paint_slider (GtkStyle *style,
gint width,
gint height,
GtkOrientation orientation);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_handle (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -591,7 +591,7 @@ void gtk_paint_handle (GtkStyle *style,
gint width,
gint height,
GtkOrientation orientation);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_expander (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -600,7 +600,7 @@ void gtk_paint_expander (GtkStyle *style,
gint x,
gint y,
GtkExpanderStyle expander_style);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_layout (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -610,7 +610,7 @@ void gtk_paint_layout (GtkStyle *style,
gint x,
gint y,
PangoLayout *layout);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_resize_grip (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -621,7 +621,7 @@ void gtk_paint_resize_grip (GtkStyle *style,
gint y,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_paint_spinner (GtkStyle *style,
cairo_t *cr,
GtkStateType state_type,
......@@ -633,17 +633,17 @@ void gtk_paint_spinner (GtkStyle *style,
gint width,
gint height);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_style_get_style_property (GtkStyle *style,
GType widget_type,
const gchar *property_name,
GValue *value);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_style_get_valist (GtkStyle *style,
GType widget_type,
const gchar *first_property_name,
va_list var_args);
GDK_DEPRECATED_FOR(GtkStyleContext)
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
void gtk_style_get (GtkStyle *style,
GType widget_type,
const gchar *first_property_name,
......
......@@ -99,15 +99,15 @@ struct _GtkTableRowCol
GType gtk_table_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
GtkWidget* gtk_table_new (guint rows,
guint columns,
gboolean homogeneous);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_resize (GtkTable *table,
guint rows,
guint columns);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_attach (GtkTable *table,
GtkWidget *child,
guint left_attach,
......@@ -118,43 +118,43 @@ void gtk_table_attach (GtkTable *table,
GtkAttachOptions yoptions,
guint xpadding,
guint ypadding);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_attach_defaults (GtkTable *table,
GtkWidget *widget,
guint left_attach,
guint right_attach,
guint top_attach,
guint bottom_attach);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_row_spacing (GtkTable *table,
guint row,
guint spacing);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
guint gtk_table_get_row_spacing (GtkTable *table,
guint row);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_col_spacing (GtkTable *table,
guint column,
guint spacing);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
guint gtk_table_get_col_spacing (GtkTable *table,
guint column);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_row_spacings (GtkTable *table,
guint spacing);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
guint gtk_table_get_default_row_spacing (GtkTable *table);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_col_spacings (GtkTable *table,
guint spacing);