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.
This commit is contained in:
Matthias Clasen 2012-02-27 07:10:59 -05:00
parent 98f3468172
commit 2c25bd85b8
70 changed files with 306 additions and 191 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -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

View File

@ -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);

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -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,

View File

@ -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);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
guint gtk_table_get_default_col_spacing (GtkTable *table);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_set_homogeneous (GtkTable *table,
gboolean homogeneous);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
gboolean gtk_table_get_homogeneous (GtkTable *table);
GDK_DEPRECATED_FOR(GtkGrid)
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
void gtk_table_get_size (GtkTable *table,
guint *rows,
guint *columns);

View File

@ -68,6 +68,7 @@ struct _GtkTearoffMenuItemClass
GType gtk_tearoff_menu_item_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4
GtkWidget* gtk_tearoff_menu_item_new (void);
G_END_DECLS

View File

@ -58,6 +58,7 @@ struct _GtkVButtonBoxClass
GType gtk_vbutton_box_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new)
GtkWidget *gtk_vbutton_box_new (void);
G_END_DECLS

View File

@ -58,7 +58,7 @@ struct _GtkVBoxClass
GType gtk_vbox_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_FOR(gtk_box_new)
GDK_DEPRECATED_IN_3_2_FOR(gtk_box_new)
GtkWidget * gtk_vbox_new (gboolean homogeneous,
gint spacing);

View File

@ -58,6 +58,7 @@ struct _GtkVPanedClass
GType gtk_vpaned_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new)
GtkWidget * gtk_vpaned_new (void);
G_END_DECLS

View File

@ -64,7 +64,9 @@ struct _GtkVScaleClass
GType gtk_vscale_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new)
GtkWidget* gtk_vscale_new (GtkAdjustment *adjustment);
GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new_with_range)
GtkWidget* gtk_vscale_new_with_range (gdouble min,
gdouble max,
gdouble step);

View File

@ -64,6 +64,7 @@ struct _GtkVScrollbarClass
GType gtk_vscrollbar_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new)
GtkWidget* gtk_vscrollbar_new (GtkAdjustment *adjustment);
G_END_DECLS

View File

@ -64,6 +64,7 @@ struct _GtkVSeparatorClass
GType gtk_vseparator_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new)
GtkWidget* gtk_vseparator_new (void);
G_END_DECLS

View File

@ -159,6 +159,7 @@ void gtk_about_dialog_set_logo (GtkAboutDialog
const gchar * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about);
void gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
const gchar *icon_name);
GDK_AVAILABLE_IN_3_4
void gtk_about_dialog_add_credit_section (GtkAboutDialog *about,
const gchar *section_name,
const gchar **people);

View File

@ -163,18 +163,21 @@ gboolean gtk_accelerator_valid (guint keyval,
void gtk_accelerator_parse (const gchar *accelerator,
guint *accelerator_key,
GdkModifierType *accelerator_mods);
GDK_AVAILABLE_IN_3_4
void gtk_accelerator_parse_with_keycode (const gchar *accelerator,
guint *accelerator_key,
guint **accelerator_codes,
GdkModifierType *accelerator_mods);
gchar* gtk_accelerator_name (guint accelerator_key,
GdkModifierType accelerator_mods);
GDK_AVAILABLE_IN_3_4
gchar* gtk_accelerator_name_with_keycode (GdkDisplay *display,
guint accelerator_key,
guint keycode,
GdkModifierType accelerator_mods);
gchar* gtk_accelerator_get_label (guint accelerator_key,
GdkModifierType accelerator_mods);
GDK_AVAILABLE_IN_3_4
gchar* gtk_accelerator_get_label_with_keycode (GdkDisplay *display,
guint accelerator_key,
guint keycode,

View File

@ -67,7 +67,7 @@ void gtk_accessible_set_widget (GtkAccessible *accessible,
GtkWidget *widget);
GtkWidget *gtk_accessible_get_widget (GtkAccessible *accessible);
GDK_DEPRECATED_FOR(gtk_accessible_set_widget)
GDK_DEPRECATED_IN_3_4_FOR(gtk_accessible_set_widget)
void gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible);
G_END_DECLS

View File

@ -23,6 +23,7 @@
#define __GTK_ACTIONABLE_H__
#include <glib-object.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
@ -49,20 +50,27 @@ struct _GtkActionableInterface
GVariant *action_target_value);
};
GDK_AVAILABLE_IN_3_4
GType gtk_actionable_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_4
const gchar * gtk_actionable_get_action_name (GtkActionable *actionable);
GDK_AVAILABLE_IN_3_4
void gtk_actionable_set_action_name (GtkActionable *actionable,
const gchar *action_name);
GDK_AVAILABLE_IN_3_4
GVariant * gtk_actionable_get_action_target_value (GtkActionable *actionable);
GDK_AVAILABLE_IN_3_4
void gtk_actionable_set_action_target_value (GtkActionable *actionable,
GVariant *target_value);
GDK_AVAILABLE_IN_3_4
void gtk_actionable_set_action_target (GtkActionable *actionable,
const gchar *format_string,
...);
GDK_AVAILABLE_IN_3_4
void gtk_actionable_set_detailed_action_name (GtkActionable *actionable,
const gchar *detailed_action_name);

View File

@ -115,7 +115,7 @@ void gtk_adjustment_configure (GtkAdjustment *adjustment,
gdouble step_increment,
gdouble page_increment,
gdouble page_size);
GDK_AVAILABLE_IN_3_2
gdouble gtk_adjustment_get_minimum_increment (GtkAdjustment *adjustment);
G_END_DECLS

View File

@ -80,8 +80,10 @@ void gtk_app_chooser_button_set_heading (GtkAppChooserButton *self
const gchar *heading);
const gchar *
gtk_app_chooser_button_get_heading (GtkAppChooserButton *self);
GDK_AVAILABLE_IN_3_2
void gtk_app_chooser_button_set_show_default_item (GtkAppChooserButton *self,
gboolean setting);
GDK_AVAILABLE_IN_3_2
gboolean gtk_app_chooser_button_get_show_default_item (GtkAppChooserButton *self);
G_END_DECLS

View File

@ -75,18 +75,24 @@ void gtk_application_remove_window (GtkApplication *application,
GtkWindow *window);
GList * gtk_application_get_windows (GtkApplication *application);
GDK_AVAILABLE_IN_3_4
GMenuModel * gtk_application_get_app_menu (GtkApplication *application);
GDK_AVAILABLE_IN_3_4
void gtk_application_set_app_menu (GtkApplication *application,
GMenuModel *app_menu);
GDK_AVAILABLE_IN_3_4
GMenuModel * gtk_application_get_menubar (GtkApplication *application);
GDK_AVAILABLE_IN_3_4
void gtk_application_set_menubar (GtkApplication *application,
GMenuModel *menubar);
GDK_AVAILABLE_IN_3_4
void gtk_application_add_accelerator (GtkApplication *application,
const gchar *accelerator,
const gchar *action_name,
GVariant *parameter);
GDK_AVAILABLE_IN_3_4
void gtk_application_remove_accelerator (GtkApplication *application,
const gchar *action_name,
GVariant *parameter);
@ -99,12 +105,15 @@ typedef enum
GTK_APPLICATION_INHIBIT_IDLE = (1 << 3)
} GtkApplicationInhibitFlags;
GDK_AVAILABLE_IN_3_4
guint gtk_application_inhibit (GtkApplication *application,
GtkWindow *window,
GtkApplicationInhibitFlags flags,
const gchar *reason);
GDK_AVAILABLE_IN_3_4
void gtk_application_uninhibit (GtkApplication *application,
guint cookie);
GDK_AVAILABLE_IN_3_4
gboolean gtk_application_is_inhibited (GtkApplication *application,
GtkApplicationInhibitFlags flags);

View File

@ -58,11 +58,15 @@ struct _GtkApplicationWindowClass
gpointer padding[14];
};
GDK_AVAILABLE_IN_3_4
GType gtk_application_window_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_4
GtkWidget * gtk_application_window_new (GtkApplication *application);
GDK_AVAILABLE_IN_3_4
void gtk_application_window_set_show_menubar (GtkApplicationWindow *window,
gboolean show_menubar);
GDK_AVAILABLE_IN_3_4
gboolean gtk_application_window_get_show_menubar (GtkApplicationWindow *window);
G_END_DECLS

View File

@ -139,6 +139,7 @@ gint gtk_assistant_append_page (GtkAssistant
gint gtk_assistant_insert_page (GtkAssistant *assistant,
GtkWidget *page,
gint position);
GDK_AVAILABLE_IN_3_2
void gtk_assistant_remove_page (GtkAssistant *assistant,
gint page_num);
void gtk_assistant_set_forward_page_func (GtkAssistant *assistant,
@ -156,18 +157,18 @@ void gtk_assistant_set_page_title (GtkAssistant
const gchar * gtk_assistant_get_page_title (GtkAssistant *assistant,
GtkWidget *page);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_2
void gtk_assistant_set_page_header_image (GtkAssistant *assistant,
GtkWidget *page,
GdkPixbuf *pixbuf);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_2
GdkPixbuf *gtk_assistant_get_page_header_image (GtkAssistant *assistant,
GtkWidget *page);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_2
void gtk_assistant_set_page_side_image (GtkAssistant *assistant,
GtkWidget *page,
GdkPixbuf *pixbuf);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_2
GdkPixbuf *gtk_assistant_get_page_side_image (GtkAssistant *assistant,
GtkWidget *page);

View File

@ -78,10 +78,10 @@ gboolean gtk_button_box_get_child_secondary (GtkButtonBox *widget,
void gtk_button_box_set_child_secondary (GtkButtonBox *widget,
GtkWidget *child,
gboolean is_secondary);
GDK_AVAILABLE_IN_3_2
gboolean gtk_button_box_get_child_non_homogeneous (GtkButtonBox *widget,
GtkWidget *child);
GDK_AVAILABLE_IN_3_2
void gtk_button_box_set_child_non_homogeneous (GtkButtonBox *widget,
GtkWidget *child,
gboolean non_homogeneous);

View File

@ -180,7 +180,7 @@ void gtk_binding_entry_remove (GtkBindingSet *binding_set,
guint keyval,
GdkModifierType modifiers);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_0
void gtk_binding_set_add_path (GtkBindingSet *binding_set,
GtkPathType path_type,
const gchar *path_pattern,

View File

@ -194,7 +194,7 @@ void gtk_cell_renderer_get_aligned_area (GtkCellRend
const GdkRectangle *cell_area,
GdkRectangle *aligned_area);
GDK_DEPRECATED_FOR(gtk_cell_renderer_get_preferred_size)
GDK_DEPRECATED_IN_3_0_FOR(gtk_cell_renderer_get_preferred_size)
void gtk_cell_renderer_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
const GdkRectangle *cell_area,

View File

@ -84,11 +84,11 @@ gboolean gtk_cell_view_get_fit_model (GtkCellView *cell_v
void gtk_cell_view_set_fit_model (GtkCellView *cell_view,
gboolean fit_model);
GDK_DEPRECATED_FOR(gtk_widget_get_preferred_size)
GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
gboolean gtk_cell_view_get_size_of_row (GtkCellView *cell_view,
GtkTreePath *path,
GtkRequisition *requisition);
GDK_DEPRECATED_FOR(gtk_cell_view_set_background_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_cell_view_set_background_rgba)
void gtk_cell_view_set_background_color (GtkCellView *cell_view,
const GdkColor *color);

View File

@ -80,28 +80,28 @@ void gtk_color_button_set_title (GtkColorButton *button,
const gchar *title);
const gchar *gtk_color_button_get_title (GtkColorButton *button);
GDK_DEPRECATED_FOR(gtk_color_button_new_with_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_new_with_rgba)
GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
GDK_DEPRECATED_FOR(gtk_color_button_set_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_set_rgba)
void gtk_color_button_set_color (GtkColorButton *button,
const GdkColor *color);
GDK_DEPRECATED_FOR(gtk_color_button_get_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_get_rgba)
void gtk_color_button_get_color (GtkColorButton *button,
GdkColor *color);
GDK_DEPRECATED_FOR(gtk_color_button_set_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_set_rgba)
void gtk_color_button_set_alpha (GtkColorButton *button,
guint16 alpha);
GDK_DEPRECATED_FOR(gtk_color_button_get_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_button_get_rgba)
guint16 gtk_color_button_get_alpha (GtkColorButton *button);
GDK_DEPRECATED_FOR(gtk_color_chooser_set_use_alpha)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_use_alpha)
void gtk_color_button_set_use_alpha (GtkColorButton *button,
gboolean use_alpha);
GDK_DEPRECATED_FOR(gtk_color_chooser_get_use_alpha)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_get_use_alpha)
gboolean gtk_color_button_get_use_alpha (GtkColorButton *button);
GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
void gtk_color_button_set_rgba (GtkColorButton *button,
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_button_get_rgba (GtkColorButton *button,
GdkRGBA *rgba);

View File

@ -61,16 +61,22 @@ struct _GtkColorChooserInterface
gpointer padding[12];
};
GDK_AVAILABLE_IN_3_4
GType gtk_color_chooser_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_4
void gtk_color_chooser_get_rgba (GtkColorChooser *chooser,
GdkRGBA *color);
GDK_AVAILABLE_IN_3_4
void gtk_color_chooser_set_rgba (GtkColorChooser *chooser,
const GdkRGBA *color);
GDK_AVAILABLE_IN_3_4
gboolean gtk_color_chooser_get_use_alpha (GtkColorChooser *chooser);
GDK_AVAILABLE_IN_3_4
void gtk_color_chooser_set_use_alpha (GtkColorChooser *chooser,
gboolean use_alpha);
GDK_AVAILABLE_IN_3_4
void gtk_color_chooser_add_palette (GtkColorChooser *chooser,
gboolean horizontal,
gint colors_per_line,

View File

@ -58,8 +58,10 @@ struct _GtkColorChooserDialogClass
void (*_gtk_reserved4) (void);
};
GDK_AVAILABLE_IN_3_4
GType gtk_color_chooser_dialog_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_4
GtkWidget * gtk_color_chooser_dialog_new (const gchar *title,
GtkWindow *parent);

View File

@ -62,8 +62,10 @@ struct _GtkColorChooserWidgetClass
void (*_gtk_reserved8) (void);
};
GDK_AVAILABLE_IN_3_4
GType gtk_color_chooser_widget_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_4
GtkWidget * gtk_color_chooser_widget_new (void);
G_END_DECLS

View File

@ -197,6 +197,7 @@ void gtk_container_child_get_property (GtkContainer *container,
const gchar *property_name,
GValue *value);
GDK_AVAILABLE_IN_3_2
void gtk_container_child_notify (GtkContainer *container,
GtkWidget *child,
const gchar *child_property);

View File

@ -74,6 +74,7 @@ GType gtk_css_provider_get_type (void) G_GNUC_CONST;
GtkCssProvider * gtk_css_provider_new (void);
GDK_AVAILABLE_IN_3_2
char * gtk_css_provider_to_string (GtkCssProvider *provider);
gboolean gtk_css_provider_load_from_data (GtkCssProvider *css_provider,

View File

@ -21,6 +21,7 @@
#define __GTK_CSS_SECTION_H__
#include <gio/gio.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
@ -66,17 +67,27 @@ typedef enum
typedef struct _GtkCssSection GtkCssSection;
GDK_AVAILABLE_IN_3_2
GType gtk_css_section_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_2
GtkCssSection * gtk_css_section_ref (GtkCssSection *section);
GDK_AVAILABLE_IN_3_2
void gtk_css_section_unref (GtkCssSection *section);
GDK_AVAILABLE_IN_3_2
GtkCssSectionType gtk_css_section_get_section_type (const GtkCssSection *section);
GDK_AVAILABLE_IN_3_2
GtkCssSection * gtk_css_section_get_parent (const GtkCssSection *section);
GDK_AVAILABLE_IN_3_2
GFile * gtk_css_section_get_file (const GtkCssSection *section);
GDK_AVAILABLE_IN_3_2
guint gtk_css_section_get_start_line (const GtkCssSection *section);
GDK_AVAILABLE_IN_3_2
guint gtk_css_section_get_start_position (const GtkCssSection *section);
GDK_AVAILABLE_IN_3_2
guint gtk_css_section_get_end_line (const GtkCssSection *section);
GDK_AVAILABLE_IN_3_2
guint gtk_css_section_get_end_position (const GtkCssSection *section);
G_END_DECLS

View File

@ -155,6 +155,7 @@ void gtk_drag_source_set_icon_stock (GtkWidget *widget,
const gchar *stock_id);
void gtk_drag_source_set_icon_name (GtkWidget *widget,
const gchar *icon_name);
GDK_AVAILABLE_IN_3_2
void gtk_drag_source_set_icon_gicon (GtkWidget *widget,
GIcon *icon);
@ -188,6 +189,7 @@ void gtk_drag_set_icon_name (GdkDragContext *context,
const gchar *icon_name,
gint hot_x,
gint hot_y);
GDK_AVAILABLE_IN_3_2
void gtk_drag_set_icon_gicon (GdkDragContext *context,
GIcon *icon,
gint hot_x,

View File

@ -149,10 +149,10 @@ void gtk_entry_set_has_frame (GtkEntry *entry,
gboolean setting);
gboolean gtk_entry_get_has_frame (GtkEntry *entry);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_entry_set_inner_border (GtkEntry *entry,
const GtkBorder *border);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
const GtkBorder* gtk_entry_get_inner_border (GtkEntry *entry);
void gtk_entry_set_overwrite_mode (GtkEntry *entry,
@ -214,9 +214,9 @@ void gtk_entry_set_progress_pulse_step (GtkEntry *entry,
gdouble gtk_entry_get_progress_pulse_step (GtkEntry *entry);
void gtk_entry_progress_pulse (GtkEntry *entry);
GDK_AVAILABLE_IN_3_2
const gchar* gtk_entry_get_placeholder_text (GtkEntry *entry);
GDK_AVAILABLE_IN_3_2
void gtk_entry_set_placeholder_text (GtkEntry *entry,
const gchar *text);
/* Setting and managing icons

View File

@ -114,6 +114,7 @@ void gtk_entry_completion_set_match_func (GtkEntryComplet
void gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion *completion,
gint length);
gint gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion *completion);
GDK_AVAILABLE_IN_3_4
gchar * gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion,
const char *key);
void gtk_entry_completion_complete (GtkEntryCompletion *completion);

View File

@ -98,9 +98,10 @@ GtkWidget *gtk_expander_get_label_widget (GtkExpander *expander);
void gtk_expander_set_label_fill (GtkExpander *expander,
gboolean label_fill);
gboolean gtk_expander_get_label_fill (GtkExpander *expander);
GDK_AVAILABLE_IN_3_2
void gtk_expander_set_resize_toplevel (GtkExpander *expander,
gboolean resize_toplevel);
GDK_AVAILABLE_IN_3_2
gboolean gtk_expander_get_resize_toplevel (GtkExpander *expander);
G_END_DECLS

View File

@ -76,27 +76,40 @@ struct _GtkFontChooserIface
gpointer padding[12];
};
GDK_AVAILABLE_IN_3_2
GType gtk_font_chooser_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_2
PangoFontFamily *gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_3_2
PangoFontFace *gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_3_2
gint gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_3_2
PangoFontDescription *
gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_3_2
void gtk_font_chooser_set_font_desc (GtkFontChooser *fontchooser,
const PangoFontDescription *font_desc);
GDK_AVAILABLE_IN_3_2
gchar* gtk_font_chooser_get_font (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_3_2
void gtk_font_chooser_set_font (GtkFontChooser *fontchooser,
const gchar *fontname);
GDK_AVAILABLE_IN_3_2
gchar* gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_3_2
void gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser,
const gchar *text);
GDK_AVAILABLE_IN_3_2
gboolean gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser);
GDK_AVAILABLE_IN_3_2
void gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser,
gboolean show_preview_entry);
GDK_AVAILABLE_IN_3_2
void gtk_font_chooser_set_filter_func (GtkFontChooser *fontchooser,
GtkFontFilterFunc filter,
gpointer user_data,

View File

@ -58,7 +58,9 @@ struct _GtkFontChooserDialogClass
void (*_gtk_reserved4) (void);
};
GDK_AVAILABLE_IN_3_2
GType gtk_font_chooser_dialog_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_2
GtkWidget* gtk_font_chooser_dialog_new (const gchar *title,
GtkWindow *parent);

View File

@ -62,8 +62,10 @@ struct _GtkFontChooserWidgetClass
void (*_gtk_reserved8) (void);
};
GDK_AVAILABLE_IN_3_2
GType gtk_font_chooser_widget_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_2
GtkWidget* gtk_font_chooser_widget_new (void);
G_END_DECLS

View File

@ -79,13 +79,17 @@ void gtk_grid_attach_next_to (GtkGrid *grid,
GtkPositionType side,
gint width,
gint height);
GDK_AVAILABLE_IN_3_2
GtkWidget *gtk_grid_get_child_at (GtkGrid *grid,
gint left,
gint top);
GDK_AVAILABLE_IN_3_2
void gtk_grid_insert_row (GtkGrid *grid,
gint position);
GDK_AVAILABLE_IN_3_2
void gtk_grid_insert_column (GtkGrid *grid,
gint position);
GDK_AVAILABLE_IN_3_2
void gtk_grid_insert_next_to (GtkGrid *grid,
GtkWidget *sibling,
GtkPositionType side);

View File

@ -130,7 +130,7 @@ GtkIconSet* gtk_icon_set_ref (GtkIconSet *icon_set);
void gtk_icon_set_unref (GtkIconSet *icon_set);
GtkIconSet* gtk_icon_set_copy (GtkIconSet *icon_set);
GDK_DEPRECATED_FOR(gtk_icon_set_render_icon_pixbuf)
GDK_DEPRECATED_IN_3_0_FOR(gtk_icon_set_render_icon_pixbuf)
GdkPixbuf* gtk_icon_set_render_icon (GtkIconSet *icon_set,
GtkStyle *style,
GtkTextDirection direction,

View File

@ -210,7 +210,7 @@ GdkPixbuf * gtk_icon_info_load_symbolic_for_context (GtkIconInfo
GtkStyleContext *context,
gboolean *was_symbolic,
GError **error);
GDK_DEPRECATED_FOR(gtk_icon_info_load_symbol_for_context)
GDK_DEPRECATED_IN_3_0_FOR(gtk_icon_info_load_symbol_for_context)
GdkPixbuf * gtk_icon_info_load_symbolic_for_style (GtkIconInfo *icon_info,
GtkStyle *style,
GtkStateType state,

View File

@ -94,14 +94,14 @@ void gtk_layout_get_size (GtkLayout *layout,
guint *width,
guint *height);
GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout *layout);
GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout *layout);
GDK_DEPRECATED_FOR(gtk_scrollable_set_hadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_hadjustment)
void gtk_layout_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment);
GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment)
void gtk_layout_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment);

View File

@ -58,9 +58,13 @@ struct _GtkLockButtonClass
void (*reserved7) (void);
};
GDK_AVAILABLE_IN_3_2
GType gtk_lock_button_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_2
GtkWidget *gtk_lock_button_new (GPermission *permission);
GDK_AVAILABLE_IN_3_2
GPermission *gtk_lock_button_get_permission (GtkLockButton *button);
GDK_AVAILABLE_IN_3_2
void gtk_lock_button_set_permission (GtkLockButton *button,
GPermission *permission);

View File

@ -152,10 +152,10 @@ void gtk_device_grab_add (GtkWidget *widget,
void gtk_device_grab_remove (GtkWidget *widget,
GdkDevice *device);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
guint gtk_key_snooper_install (GtkKeySnoopFunc snooper,
gpointer func_data);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_key_snooper_remove (guint snooper_handler_id);
GdkEvent * gtk_get_current_event (void);

View File

@ -117,6 +117,7 @@ struct _GtkMenuClass
GType gtk_menu_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_menu_new (void);
GDK_AVAILABLE_IN_3_4
GtkWidget* gtk_menu_new_from_model (GMenuModel *model);
/* Display the menu onscreen */

View File

@ -71,6 +71,7 @@ struct _GtkMenuBarClass
GType gtk_menu_bar_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_menu_bar_new (void);
GDK_AVAILABLE_IN_3_4
GtkWidget* gtk_menu_bar_new_from_model (GMenuModel *model);
GtkPackDirection gtk_menu_bar_get_pack_direction (GtkMenuBar *menubar);

View File

@ -104,10 +104,10 @@ void gtk_menu_item_toggle_size_request (GtkMenuItem *menu_item,
gint *requisition);
void gtk_menu_item_toggle_size_allocate (GtkMenuItem *menu_item,
gint allocation);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_2
void gtk_menu_item_set_right_justified (GtkMenuItem *menu_item,
gboolean right_justified);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_2
gboolean gtk_menu_item_get_right_justified (GtkMenuItem *menu_item);
void gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
const gchar *accel_path);

View File

@ -68,9 +68,11 @@ struct _GtkOverlayClass
void (*_gtk_reserved8) (void);
};
GDK_AVAILABLE_IN_3_2
GType gtk_overlay_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_2
GtkWidget *gtk_overlay_new (void);
GDK_AVAILABLE_IN_3_2
void gtk_overlay_add_overlay (GtkOverlay *overlay,
GtkWidget *widget);

View File

@ -90,8 +90,10 @@ gint gtk_scale_get_digits (GtkScale *scale);
void gtk_scale_set_draw_value (GtkScale *scale,
gboolean draw_value);
gboolean gtk_scale_get_draw_value (GtkScale *scale);
GDK_AVAILABLE_IN_3_4
void gtk_scale_set_has_origin (GtkScale *scale,
gboolean has_origin);
GDK_AVAILABLE_IN_3_4
gboolean gtk_scale_get_has_origin (GtkScale *scale);
void gtk_scale_set_value_pos (GtkScale *scale,
GtkPositionType pos);

View File

@ -742,7 +742,7 @@ gboolean gtk_style_context_state_is_running (GtkStyleContext *context,
void gtk_style_context_set_path (GtkStyleContext *context,
GtkWidgetPath *path);
const GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context);
GDK_AVAILABLE_IN_3_4
void gtk_style_context_set_parent (GtkStyleContext *context,
GtkStyleContext *parent);
GtkStyleContext *gtk_style_context_get_parent (GtkStyleContext *context);
@ -934,11 +934,13 @@ void gtk_render_activity (GtkStyleContext *context,
GdkPixbuf * gtk_render_icon_pixbuf (GtkStyleContext *context,
const GtkIconSource *source,
GtkIconSize size);
GDK_AVAILABLE_IN_3_2
void gtk_render_icon (GtkStyleContext *context,
cairo_t *cr,
GdkPixbuf *pixbuf,
gdouble x,
gdouble y);
GDK_AVAILABLE_IN_3_4
void gtk_render_insertion_cursor
(GtkStyleContext *context,
cairo_t *cr,

View File

@ -88,6 +88,7 @@ GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
GtkTextIter *gtk_text_iter_copy (const GtkTextIter *iter);
void gtk_text_iter_free (GtkTextIter *iter);
GDK_AVAILABLE_IN_3_2
void gtk_text_iter_assign (GtkTextIter *iter,
const GtkTextIter *other);

View File

@ -188,9 +188,9 @@ void gtk_text_view_window_to_buffer_coords (GtkTextView *text_view,
gint *buffer_x,
gint *buffer_y);
GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
GtkAdjustment* gtk_text_view_get_hadjustment (GtkTextView *text_view);
GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
GtkAdjustment* gtk_text_view_get_vadjustment (GtkTextView *text_view);
GdkWindow* gtk_text_view_get_window (GtkTextView *text_view,

View File

@ -127,9 +127,9 @@ void gtk_tool_palette_add_drag_dest (GtkToolPa
GdkDragAction actions);
GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
GtkAdjustment* gtk_tool_palette_get_hadjustment (GtkToolPalette *palette);
GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
GtkAdjustment* gtk_tool_palette_get_vadjustment (GtkToolPalette *palette);
const GtkTargetEntry* gtk_tool_palette_get_drag_target_item (void) G_GNUC_CONST;

View File

@ -214,14 +214,14 @@ void gtk_tree_view_set_model (GtkTreeView
GtkTreeModel *model);
GtkTreeSelection *gtk_tree_view_get_selection (GtkTreeView *tree_view);
GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
GtkAdjustment *gtk_tree_view_get_hadjustment (GtkTreeView *tree_view);
GDK_DEPRECATED_FOR(gtk_scrollable_set_hadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_hadjustment)
void gtk_tree_view_set_hadjustment (GtkTreeView *tree_view,
GtkAdjustment *adjustment);
GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
GtkAdjustment *gtk_tree_view_get_vadjustment (GtkTreeView *tree_view);
GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment)
void gtk_tree_view_set_vadjustment (GtkTreeView *tree_view,
GtkAdjustment *adjustment);
@ -257,6 +257,8 @@ gint gtk_tree_view_insert_column_with_data_func (GtkTreeView
GtkTreeCellDataFunc func,
gpointer data,
GDestroyNotify dnotify);
GDK_AVAILABLE_IN_3_4
guint gtk_tree_view_get_n_columns (GtkTreeView *tree_view);
GtkTreeViewColumn *gtk_tree_view_get_column (GtkTreeView *tree_view,
gint n);
@ -435,7 +437,7 @@ typedef void (* GtkTreeDestroyCountFunc) (GtkTreeView *tree_view,
GtkTreePath *path,
gint children,
gpointer user_data);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_tree_view_set_destroy_count_func (GtkTreeView *tree_view,
GtkTreeDestroyCountFunc func,
gpointer data,

View File

@ -142,6 +142,7 @@ gboolean gtk_tree_view_column_get_resizable (GtkTreeViewCol
void gtk_tree_view_column_set_sizing (GtkTreeViewColumn *tree_column,
GtkTreeViewColumnSizing type);
GtkTreeViewColumnSizing gtk_tree_view_column_get_sizing (GtkTreeViewColumn *tree_column);
GDK_AVAILABLE_IN_3_2
gint gtk_tree_view_column_get_x_offset (GtkTreeViewColumn *tree_column);
gint gtk_tree_view_column_get_width (GtkTreeViewColumn *tree_column);
gint gtk_tree_view_column_get_fixed_width (GtkTreeViewColumn *tree_column);

View File

@ -126,10 +126,10 @@ typedef enum {
GType gtk_ui_manager_get_type (void) G_GNUC_CONST;
GtkUIManager *gtk_ui_manager_new (void);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
void gtk_ui_manager_set_add_tearoffs (GtkUIManager *manager,
gboolean add_tearoffs);
GDK_DEPRECATED
GDK_DEPRECATED_IN_3_4
gboolean gtk_ui_manager_get_add_tearoffs (GtkUIManager *manager);
void gtk_ui_manager_insert_action_group (GtkUIManager *manager,

View File

@ -75,14 +75,14 @@ GType gtk_viewport_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_viewport_new (GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
GDK_DEPRECATED_FOR(gtk_scrollable_get_hadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport *viewport);
GDK_DEPRECATED_FOR(gtk_scrollable_get_vadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport *viewport);
GDK_DEPRECATED_FOR(gtk_scrollable_set_hadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_hadjustment)
void gtk_viewport_set_hadjustment (GtkViewport *viewport,
GtkAdjustment *adjustment);
GDK_DEPRECATED_FOR(gtk_scrollable_set_vadjustment)
GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment)
void gtk_viewport_set_vadjustment (GtkViewport *viewport,
GtkAdjustment *adjustment);

View File

@ -483,7 +483,7 @@ void gtk_widget_queue_draw_region (GtkWidget *widget,
const cairo_region_t*region);
void gtk_widget_queue_resize (GtkWidget *widget);
void gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
GDK_DEPRECATED_FOR(gtk_widget_get_preferred_size)
GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
void gtk_widget_size_request (GtkWidget *widget,
GtkRequisition *requisition);
void gtk_widget_size_allocate (GtkWidget *widget,
@ -508,7 +508,7 @@ void gtk_widget_get_preferred_size (GtkWidget *w
GtkRequisition *minimum_size,
GtkRequisition *natural_size);
GDK_DEPRECATED_FOR(gtk_widget_get_preferred_size)
GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
void gtk_widget_get_child_requisition (GtkWidget *widget,
GtkRequisition *requisition);
void gtk_widget_add_accelerator (GtkWidget *widget,
@ -556,6 +556,7 @@ void gtk_widget_set_can_focus (GtkWidget *widget,
gboolean gtk_widget_get_can_focus (GtkWidget *widget);
gboolean gtk_widget_has_focus (GtkWidget *widget);
gboolean gtk_widget_is_focus (GtkWidget *widget);
GDK_AVAILABLE_IN_3_2
gboolean gtk_widget_has_visible_focus (GtkWidget *widget);
void gtk_widget_grab_focus (GtkWidget *widget);
@ -719,8 +720,10 @@ void gtk_widget_set_support_multidevice (GtkWidget *widget,
gboolean support_multidevice);
/* Accessibility support */
GDK_AVAILABLE_IN_3_2
void gtk_widget_class_set_accessible_type (GtkWidgetClass *widget_class,
GType type);
GDK_AVAILABLE_IN_3_2
void gtk_widget_class_set_accessible_role (GtkWidgetClass *widget_class,
AtkRole role);
AtkObject* gtk_widget_get_accessible (GtkWidget *widget);
@ -750,7 +753,7 @@ void gtk_widget_set_margin_bottom (GtkWidget *widget,
gint gtk_widget_get_events (GtkWidget *widget);
GdkEventMask gtk_widget_get_device_events (GtkWidget *widget,
GdkDevice *device);
GDK_DEPRECATED_FOR(gdk_window_get_device_position)
GDK_DEPRECATED_IN_3_0_FOR(gdk_window_get_device_position)
void gtk_widget_get_pointer (GtkWidget *widget,
gint *x,
gint *y);
@ -889,6 +892,7 @@ GtkStyleContext * gtk_widget_get_style_context (GtkWidget *widget);
GtkWidgetPath * gtk_widget_get_path (GtkWidget *widget);
GDK_AVAILABLE_IN_3_4
GdkModifierType gtk_widget_get_modifier_mask (GtkWidget *widget,
GdkModifierIntent intent);

View File

@ -25,6 +25,7 @@
#define __GTK_WIDGET_PATH_H__
#include <glib-object.h>
#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
G_BEGIN_DECLS
@ -41,10 +42,13 @@ GType gtk_widget_path_get_type (void) G_GNUC_CONST;
GtkWidgetPath * gtk_widget_path_new (void);
GtkWidgetPath * gtk_widget_path_copy (const GtkWidgetPath *path);
GDK_AVAILABLE_IN_3_2
GtkWidgetPath * gtk_widget_path_ref (GtkWidgetPath *path);
GDK_AVAILABLE_IN_3_2
void gtk_widget_path_unref (GtkWidgetPath *path);
void gtk_widget_path_free (GtkWidgetPath *path);
GDK_AVAILABLE_IN_3_2
char * gtk_widget_path_to_string (const GtkWidgetPath *path);
gint gtk_widget_path_length (const GtkWidgetPath *path);
@ -52,10 +56,12 @@ gint gtk_widget_path_append_type (GtkWidgetPath *path,
GType type);
void gtk_widget_path_prepend_type (GtkWidgetPath *path,
GType type);
GDK_AVAILABLE_IN_3_2
gint gtk_widget_path_append_with_siblings(GtkWidgetPath *path,
GtkWidgetPath *siblings,
guint sibling_index);
/* gtk_widget_path_append_for_widget() is declared in gtkwidget.c */
GDK_AVAILABLE_IN_3_2
gint gtk_widget_path_append_for_widget (GtkWidgetPath *path,
GtkWidget *widget);

View File

@ -135,8 +135,10 @@ gboolean gtk_window_activate_default (GtkWindow *window);
void gtk_window_set_transient_for (GtkWindow *window,
GtkWindow *parent);
GtkWindow *gtk_window_get_transient_for (GtkWindow *window);
GDK_AVAILABLE_IN_3_4
void gtk_window_set_attached_to (GtkWindow *window,
GtkWidget *attach_widget);
GDK_AVAILABLE_IN_3_4
GtkWidget *gtk_window_get_attached_to (GtkWindow *window);
void gtk_window_set_opacity (GtkWindow *window,
gdouble opacity);
@ -162,14 +164,18 @@ gboolean gtk_window_get_focus_on_map (GtkWindow *window);
void gtk_window_set_destroy_with_parent (GtkWindow *window,
gboolean setting);
gboolean gtk_window_get_destroy_with_parent (GtkWindow *window);
GDK_AVAILABLE_IN_3_4
void gtk_window_set_hide_titlebar_when_maximized (GtkWindow *window,
gboolean setting);
GDK_AVAILABLE_IN_3_4
gboolean gtk_window_get_hide_titlebar_when_maximized (GtkWindow *window);
void gtk_window_set_mnemonics_visible (GtkWindow *window,
gboolean setting);
gboolean gtk_window_get_mnemonics_visible (GtkWindow *window);
GDK_AVAILABLE_IN_3_2
void gtk_window_set_focus_visible (GtkWindow *window,
gboolean setting);
GDK_AVAILABLE_IN_3_2
gboolean gtk_window_get_focus_visible (GtkWindow *window);
void gtk_window_set_resizable (GtkWindow *window,