Commit 20c8c8b9 authored by Matthias Clasen's avatar Matthias Clasen

Add annotations to gtk headers

Add annotations to all exported functions in GTK+ headers.
parent 8470eb84
...@@ -86,6 +86,7 @@ struct _GtkColorSelectionClass ...@@ -86,6 +86,7 @@ struct _GtkColorSelectionClass
/* ColorSelection */ /* ColorSelection */
GDK_DEPRECATED_IN_3_4
GType gtk_color_selection_get_type (void) G_GNUC_CONST; GType gtk_color_selection_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_widget_new) GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_widget_new)
GtkWidget *gtk_color_selection_new (void); GtkWidget *gtk_color_selection_new (void);
...@@ -136,6 +137,7 @@ GDK_DEPRECATED_IN_3_4 ...@@ -136,6 +137,7 @@ GDK_DEPRECATED_IN_3_4
gchar* gtk_color_selection_palette_to_string (const GdkColor *colors, gchar* gtk_color_selection_palette_to_string (const GdkColor *colors,
gint n_colors); gint n_colors);
GDK_DEPRECATED_IN_3_4
GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func); GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);
GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba) GDK_DEPRECATED_IN_3_4_FOR(gtk_color_chooser_set_rgba)
......
...@@ -68,6 +68,7 @@ struct _GtkColorSelectionDialogClass ...@@ -68,6 +68,7 @@ struct _GtkColorSelectionDialogClass
/* ColorSelectionDialog */ /* ColorSelectionDialog */
GDK_DEPRECATED_IN_3_4
GType gtk_color_selection_dialog_get_type (void) G_GNUC_CONST; GType gtk_color_selection_dialog_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4_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); GtkWidget* gtk_color_selection_dialog_new (const gchar *title);
......
...@@ -103,6 +103,7 @@ struct _GtkFontSelectionDialogClass ...@@ -103,6 +103,7 @@ struct _GtkFontSelectionDialogClass
void (*_gtk_reserved4) (void); void (*_gtk_reserved4) (void);
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_font_selection_get_type (void) G_GNUC_CONST; GType gtk_font_selection_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser) GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget * gtk_font_selection_new (void); GtkWidget * gtk_font_selection_new (void);
...@@ -136,7 +137,7 @@ GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser) ...@@ -136,7 +137,7 @@ GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel, void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,
const gchar *text); const gchar *text);
GDK_DEPRECATED_IN_3_2
GType gtk_font_selection_dialog_get_type (void) G_GNUC_CONST; GType gtk_font_selection_dialog_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser) GDK_DEPRECATED_IN_3_2_FOR(GtkFontChooser)
GtkWidget *gtk_font_selection_dialog_new (const gchar *title); GtkWidget *gtk_font_selection_dialog_new (const gchar *title);
......
...@@ -31,6 +31,7 @@ G_BEGIN_DECLS ...@@ -31,6 +31,7 @@ G_BEGIN_DECLS
#define GTK_TYPE_GRADIENT (gtk_gradient_get_type ()) #define GTK_TYPE_GRADIENT (gtk_gradient_get_type ())
GDK_DEPRECATED_IN_3_8
GType gtk_gradient_get_type (void) G_GNUC_CONST; GType gtk_gradient_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_8 GDK_DEPRECATED_IN_3_8
......
...@@ -74,6 +74,7 @@ struct _GtkHandleBoxClass ...@@ -74,6 +74,7 @@ struct _GtkHandleBoxClass
}; };
GDK_DEPRECATED_IN_3_4
GType gtk_handle_box_get_type (void) G_GNUC_CONST; GType gtk_handle_box_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4 GDK_DEPRECATED_IN_3_4
GtkWidget* gtk_handle_box_new (void); GtkWidget* gtk_handle_box_new (void);
......
...@@ -56,6 +56,7 @@ struct _GtkHButtonBoxClass ...@@ -56,6 +56,7 @@ struct _GtkHButtonBoxClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_hbutton_box_get_type (void) G_GNUC_CONST; GType gtk_hbutton_box_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new)
GtkWidget* gtk_hbutton_box_new (void); GtkWidget* gtk_hbutton_box_new (void);
......
...@@ -57,6 +57,7 @@ struct _GtkHBoxClass ...@@ -57,6 +57,7 @@ struct _GtkHBoxClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_hbox_get_type (void) G_GNUC_CONST; GType gtk_hbox_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_box_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_box_new)
GtkWidget * gtk_hbox_new (gboolean homogeneous, GtkWidget * gtk_hbox_new (gboolean homogeneous,
......
...@@ -55,6 +55,7 @@ struct _GtkHPanedClass ...@@ -55,6 +55,7 @@ struct _GtkHPanedClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_hpaned_get_type (void) G_GNUC_CONST; GType gtk_hpaned_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new)
GtkWidget * gtk_hpaned_new (void); GtkWidget * gtk_hpaned_new (void);
......
...@@ -55,6 +55,7 @@ struct _GtkHScaleClass ...@@ -55,6 +55,7 @@ struct _GtkHScaleClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_hscale_get_type (void) G_GNUC_CONST; GType gtk_hscale_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new)
GtkWidget* gtk_hscale_new (GtkAdjustment *adjustment); GtkWidget* gtk_hscale_new (GtkAdjustment *adjustment);
......
...@@ -55,6 +55,7 @@ struct _GtkHScrollbarClass ...@@ -55,6 +55,7 @@ struct _GtkHScrollbarClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_hscrollbar_get_type (void) G_GNUC_CONST; GType gtk_hscrollbar_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new)
GtkWidget* gtk_hscrollbar_new (GtkAdjustment *adjustment); GtkWidget* gtk_hscrollbar_new (GtkAdjustment *adjustment);
......
...@@ -55,6 +55,7 @@ struct _GtkHSeparatorClass ...@@ -55,6 +55,7 @@ struct _GtkHSeparatorClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_hseparator_get_type (void) G_GNUC_CONST; GType gtk_hseparator_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new)
GtkWidget* gtk_hseparator_new (void); GtkWidget* gtk_hseparator_new (void);
......
...@@ -77,6 +77,7 @@ struct _GtkHSVClass ...@@ -77,6 +77,7 @@ struct _GtkHSVClass
}; };
GDK_DEPRECATED_IN_3_4
GType gtk_hsv_get_type (void) G_GNUC_CONST; GType gtk_hsv_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4 GDK_DEPRECATED_IN_3_4
GtkWidget* gtk_hsv_new (void); GtkWidget* gtk_hsv_new (void);
......
...@@ -175,6 +175,7 @@ void gtk_rc_parse_string (const gchar *rc_string); ...@@ -175,6 +175,7 @@ void gtk_rc_parse_string (const gchar *rc_string);
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext) GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
gboolean gtk_rc_reparse_all (void); gboolean gtk_rc_reparse_all (void);
GDK_DEPRECATED_IN_3_0
GType gtk_rc_style_get_type (void) G_GNUC_CONST; GType gtk_rc_style_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext) GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkRcStyle* gtk_rc_style_new (void); GtkRcStyle* gtk_rc_style_new (void);
......
...@@ -366,6 +366,7 @@ struct _GtkStyleClass ...@@ -366,6 +366,7 @@ struct _GtkStyleClass
void (*_gtk_reserved11) (void); void (*_gtk_reserved11) (void);
}; };
GDK_DEPRECATED_IN_3_0
GType gtk_style_get_type (void) G_GNUC_CONST; GType gtk_style_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext) GDK_DEPRECATED_IN_3_0_FOR(GtkStyleContext)
GtkStyle* gtk_style_new (void); GtkStyle* gtk_style_new (void);
......
...@@ -29,6 +29,7 @@ G_BEGIN_DECLS ...@@ -29,6 +29,7 @@ G_BEGIN_DECLS
#define GTK_TYPE_SYMBOLIC_COLOR (gtk_symbolic_color_get_type ()) #define GTK_TYPE_SYMBOLIC_COLOR (gtk_symbolic_color_get_type ())
GDK_DEPRECATED_IN_3_8
GType gtk_symbolic_color_get_type (void) G_GNUC_CONST; GType gtk_symbolic_color_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_8 GDK_DEPRECATED_IN_3_8
......
...@@ -96,6 +96,7 @@ struct _GtkTableRowCol ...@@ -96,6 +96,7 @@ struct _GtkTableRowCol
}; };
GDK_DEPRECATED_IN_3_4
GType gtk_table_get_type (void) G_GNUC_CONST; GType gtk_table_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) GDK_DEPRECATED_IN_3_4_FOR(GtkGrid)
GtkWidget* gtk_table_new (guint rows, GtkWidget* gtk_table_new (guint rows,
......
...@@ -65,6 +65,7 @@ struct _GtkTearoffMenuItemClass ...@@ -65,6 +65,7 @@ struct _GtkTearoffMenuItemClass
}; };
GDK_DEPRECATED_IN_3_4
GType gtk_tearoff_menu_item_get_type (void) G_GNUC_CONST; GType gtk_tearoff_menu_item_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_4 GDK_DEPRECATED_IN_3_4
GtkWidget* gtk_tearoff_menu_item_new (void); GtkWidget* gtk_tearoff_menu_item_new (void);
......
...@@ -55,6 +55,7 @@ struct _GtkVButtonBoxClass ...@@ -55,6 +55,7 @@ struct _GtkVButtonBoxClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_vbutton_box_get_type (void) G_GNUC_CONST; GType gtk_vbutton_box_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_button_box_new)
GtkWidget *gtk_vbutton_box_new (void); GtkWidget *gtk_vbutton_box_new (void);
......
...@@ -55,6 +55,7 @@ struct _GtkVBoxClass ...@@ -55,6 +55,7 @@ struct _GtkVBoxClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_vbox_get_type (void) G_GNUC_CONST; GType gtk_vbox_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_box_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_box_new)
GtkWidget * gtk_vbox_new (gboolean homogeneous, GtkWidget * gtk_vbox_new (gboolean homogeneous,
......
...@@ -55,6 +55,7 @@ struct _GtkVPanedClass ...@@ -55,6 +55,7 @@ struct _GtkVPanedClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_vpaned_get_type (void) G_GNUC_CONST; GType gtk_vpaned_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_paned_new)
GtkWidget * gtk_vpaned_new (void); GtkWidget * gtk_vpaned_new (void);
......
...@@ -61,6 +61,7 @@ struct _GtkVScaleClass ...@@ -61,6 +61,7 @@ struct _GtkVScaleClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_vscale_get_type (void) G_GNUC_CONST; GType gtk_vscale_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_scale_new)
GtkWidget* gtk_vscale_new (GtkAdjustment *adjustment); GtkWidget* gtk_vscale_new (GtkAdjustment *adjustment);
......
...@@ -61,6 +61,7 @@ struct _GtkVScrollbarClass ...@@ -61,6 +61,7 @@ struct _GtkVScrollbarClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_vscrollbar_get_type (void) G_GNUC_CONST; GType gtk_vscrollbar_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_scrollbar_new)
GtkWidget* gtk_vscrollbar_new (GtkAdjustment *adjustment); GtkWidget* gtk_vscrollbar_new (GtkAdjustment *adjustment);
......
...@@ -61,6 +61,7 @@ struct _GtkVSeparatorClass ...@@ -61,6 +61,7 @@ struct _GtkVSeparatorClass
}; };
GDK_DEPRECATED_IN_3_2
GType gtk_vseparator_get_type (void) G_GNUC_CONST; GType gtk_vseparator_get_type (void) G_GNUC_CONST;
GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new) GDK_DEPRECATED_IN_3_2_FOR(gtk_separator_new)
GtkWidget* gtk_vseparator_new (void); GtkWidget* gtk_vseparator_new (void);
......
...@@ -105,56 +105,89 @@ struct _GtkAboutDialogClass ...@@ -105,56 +105,89 @@ struct _GtkAboutDialogClass
void (*_gtk_reserved4) (void); void (*_gtk_reserved4) (void);
}; };
GDK_AVAILABLE_IN_ALL
GType gtk_about_dialog_get_type (void) G_GNUC_CONST; GType gtk_about_dialog_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GtkWidget *gtk_about_dialog_new (void); GtkWidget *gtk_about_dialog_new (void);
GDK_AVAILABLE_IN_ALL
void gtk_show_about_dialog (GtkWindow *parent, void gtk_show_about_dialog (GtkWindow *parent,
const gchar *first_property_name, const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_program_name (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_program_name (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_program_name (GtkAboutDialog *about, void gtk_about_dialog_set_program_name (GtkAboutDialog *about,
const gchar *name); const gchar *name);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_version (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_version (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_version (GtkAboutDialog *about, void gtk_about_dialog_set_version (GtkAboutDialog *about,
const gchar *version); const gchar *version);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_copyright (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_copyright (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_copyright (GtkAboutDialog *about, void gtk_about_dialog_set_copyright (GtkAboutDialog *about,
const gchar *copyright); const gchar *copyright);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_comments (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_comments (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_comments (GtkAboutDialog *about, void gtk_about_dialog_set_comments (GtkAboutDialog *about,
const gchar *comments); const gchar *comments);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_license (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_license (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_license (GtkAboutDialog *about, void gtk_about_dialog_set_license (GtkAboutDialog *about,
const gchar *license); const gchar *license);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_license_type (GtkAboutDialog *about, void gtk_about_dialog_set_license_type (GtkAboutDialog *about,
GtkLicense license_type); GtkLicense license_type);
GDK_AVAILABLE_IN_ALL
GtkLicense gtk_about_dialog_get_license_type (GtkAboutDialog *about); GtkLicense gtk_about_dialog_get_license_type (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
gboolean gtk_about_dialog_get_wrap_license (GtkAboutDialog *about); gboolean gtk_about_dialog_get_wrap_license (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_wrap_license (GtkAboutDialog *about, void gtk_about_dialog_set_wrap_license (GtkAboutDialog *about,
gboolean wrap_license); gboolean wrap_license);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_website (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_website (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_website (GtkAboutDialog *about, void gtk_about_dialog_set_website (GtkAboutDialog *about,
const gchar *website); const gchar *website);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_website_label (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_website_label (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_website_label (GtkAboutDialog *about, void gtk_about_dialog_set_website_label (GtkAboutDialog *about,
const gchar *website_label); const gchar *website_label);
GDK_AVAILABLE_IN_ALL
const gchar* const * gtk_about_dialog_get_authors (GtkAboutDialog *about); const gchar* const * gtk_about_dialog_get_authors (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_authors (GtkAboutDialog *about, void gtk_about_dialog_set_authors (GtkAboutDialog *about,
const gchar **authors); const gchar **authors);
GDK_AVAILABLE_IN_ALL
const gchar* const * gtk_about_dialog_get_documenters (GtkAboutDialog *about); const gchar* const * gtk_about_dialog_get_documenters (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_documenters (GtkAboutDialog *about, void gtk_about_dialog_set_documenters (GtkAboutDialog *about,
const gchar **documenters); const gchar **documenters);
GDK_AVAILABLE_IN_ALL
const gchar* const * gtk_about_dialog_get_artists (GtkAboutDialog *about); const gchar* const * gtk_about_dialog_get_artists (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_artists (GtkAboutDialog *about, void gtk_about_dialog_set_artists (GtkAboutDialog *about,
const gchar **artists); const gchar **artists);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_translator_credits (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_translator_credits (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_translator_credits (GtkAboutDialog *about, void gtk_about_dialog_set_translator_credits (GtkAboutDialog *about,
const gchar *translator_credits); const gchar *translator_credits);
GDK_AVAILABLE_IN_ALL
GdkPixbuf *gtk_about_dialog_get_logo (GtkAboutDialog *about); GdkPixbuf *gtk_about_dialog_get_logo (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_logo (GtkAboutDialog *about, void gtk_about_dialog_set_logo (GtkAboutDialog *about,
GdkPixbuf *logo); GdkPixbuf *logo);
GDK_AVAILABLE_IN_ALL
const gchar * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about); const gchar * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about);
GDK_AVAILABLE_IN_ALL
void gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about, void gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
const gchar *icon_name); const gchar *icon_name);
GDK_AVAILABLE_IN_3_4 GDK_AVAILABLE_IN_3_4
......
...@@ -113,26 +113,37 @@ struct _GtkAccelKey ...@@ -113,26 +113,37 @@ struct _GtkAccelKey
/* -- Accelerator Groups --- */ /* -- Accelerator Groups --- */
GDK_AVAILABLE_IN_ALL
GType gtk_accel_group_get_type (void) G_GNUC_CONST; GType gtk_accel_group_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GtkAccelGroup* gtk_accel_group_new (void); GtkAccelGroup* gtk_accel_group_new (void);
GDK_AVAILABLE_IN_ALL
gboolean gtk_accel_group_get_is_locked (GtkAccelGroup *accel_group); gboolean gtk_accel_group_get_is_locked (GtkAccelGroup *accel_group);
GDK_AVAILABLE_IN_ALL
GdkModifierType GdkModifierType
gtk_accel_group_get_modifier_mask (GtkAccelGroup *accel_group); gtk_accel_group_get_modifier_mask (GtkAccelGroup *accel_group);
GDK_AVAILABLE_IN_ALL
void gtk_accel_group_lock (GtkAccelGroup *accel_group); void gtk_accel_group_lock (GtkAccelGroup *accel_group);
GDK_AVAILABLE_IN_ALL
void gtk_accel_group_unlock (GtkAccelGroup *accel_group); void gtk_accel_group_unlock (GtkAccelGroup *accel_group);
GDK_AVAILABLE_IN_ALL
void gtk_accel_group_connect (GtkAccelGroup *accel_group, void gtk_accel_group_connect (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
GtkAccelFlags accel_flags, GtkAccelFlags accel_flags,
GClosure *closure); GClosure *closure);
GDK_AVAILABLE_IN_ALL
void gtk_accel_group_connect_by_path (GtkAccelGroup *accel_group, void gtk_accel_group_connect_by_path (GtkAccelGroup *accel_group,
const gchar *accel_path, const gchar *accel_path,
GClosure *closure); GClosure *closure);
GDK_AVAILABLE_IN_ALL
gboolean gtk_accel_group_disconnect (GtkAccelGroup *accel_group, gboolean gtk_accel_group_disconnect (GtkAccelGroup *accel_group,
GClosure *closure); GClosure *closure);
GDK_AVAILABLE_IN_ALL
gboolean gtk_accel_group_disconnect_key (GtkAccelGroup *accel_group, gboolean gtk_accel_group_disconnect_key (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods); GdkModifierType accel_mods);
GDK_AVAILABLE_IN_ALL
gboolean gtk_accel_group_activate (GtkAccelGroup *accel_group, gboolean gtk_accel_group_activate (GtkAccelGroup *accel_group,
GQuark accel_quark, GQuark accel_quark,
GObject *acceleratable, GObject *acceleratable,
...@@ -145,19 +156,25 @@ void _gtk_accel_group_attach (GtkAccelGroup *accel_group, ...@@ -145,19 +156,25 @@ void _gtk_accel_group_attach (GtkAccelGroup *accel_group,
GObject *object); GObject *object);
void _gtk_accel_group_detach (GtkAccelGroup *accel_group, void _gtk_accel_group_detach (GtkAccelGroup *accel_group,
GObject *object); GObject *object);
GDK_AVAILABLE_IN_ALL
gboolean gtk_accel_groups_activate (GObject *object, gboolean gtk_accel_groups_activate (GObject *object,
guint accel_key, guint accel_key,
GdkModifierType accel_mods); GdkModifierType accel_mods);
GDK_AVAILABLE_IN_ALL
GSList* gtk_accel_groups_from_object (GObject *object); GSList* gtk_accel_groups_from_object (GObject *object);
GDK_AVAILABLE_IN_ALL
GtkAccelKey* gtk_accel_group_find (GtkAccelGroup *accel_group, GtkAccelKey* gtk_accel_group_find (GtkAccelGroup *accel_group,
GtkAccelGroupFindFunc find_func, GtkAccelGroupFindFunc find_func,
gpointer data); gpointer data);
GDK_AVAILABLE_IN_ALL
GtkAccelGroup* gtk_accel_group_from_accel_closure (GClosure *closure); GtkAccelGroup* gtk_accel_group_from_accel_closure (GClosure *closure);
/* --- Accelerators--- */ /* --- Accelerators--- */
GDK_AVAILABLE_IN_ALL
gboolean gtk_accelerator_valid (guint keyval, gboolean gtk_accelerator_valid (guint keyval,
GdkModifierType modifiers) G_GNUC_CONST; GdkModifierType modifiers) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
void gtk_accelerator_parse (const gchar *accelerator, void gtk_accelerator_parse (const gchar *accelerator,
guint *accelerator_key, guint *accelerator_key,
GdkModifierType *accelerator_mods); GdkModifierType *accelerator_mods);
...@@ -166,6 +183,7 @@ void gtk_accelerator_parse_with_keycode (const gchar *accelerator, ...@@ -166,6 +183,7 @@ void gtk_accelerator_parse_with_keycode (const gchar *accelerator,
guint *accelerator_key, guint *accelerator_key,
guint **accelerator_codes, guint **accelerator_codes,
GdkModifierType *accelerator_mods); GdkModifierType *accelerator_mods);
GDK_AVAILABLE_IN_ALL
gchar* gtk_accelerator_name (guint accelerator_key, gchar* gtk_accelerator_name (guint accelerator_key,
GdkModifierType accelerator_mods); GdkModifierType accelerator_mods);
GDK_AVAILABLE_IN_3_4 GDK_AVAILABLE_IN_3_4
...@@ -173,6 +191,7 @@ gchar* gtk_accelerator_name_with_keycode (GdkDisplay *display, ...@@ -173,6 +191,7 @@ gchar* gtk_accelerator_name_with_keycode (GdkDisplay *display,
guint accelerator_key, guint accelerator_key,
guint keycode, guint keycode,
GdkModifierType accelerator_mods); GdkModifierType accelerator_mods);
GDK_AVAILABLE_IN_ALL
gchar* gtk_accelerator_get_label (guint accelerator_key, gchar* gtk_accelerator_get_label (guint accelerator_key,
GdkModifierType accelerator_mods); GdkModifierType accelerator_mods);
GDK_AVAILABLE_IN_3_4 GDK_AVAILABLE_IN_3_4
...@@ -180,12 +199,15 @@ gchar* gtk_accelerator_get_label_with_keycode (GdkDisplay *display, ...@@ -180,12 +199,15 @@ gchar* gtk_accelerator_get_label_with_keycode (GdkDisplay *display,
guint accelerator_key, guint accelerator_key,
guint keycode, guint keycode,
GdkModifierType accelerator_mods); GdkModifierType accelerator_mods);
GDK_AVAILABLE_IN_ALL
void gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask); void gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask);
GDK_AVAILABLE_IN_ALL
GdkModifierType GdkModifierType
gtk_accelerator_get_default_mod_mask (void); gtk_accelerator_get_default_mod_mask (void);
/* --- internal --- */ /* --- internal --- */
GDK_AVAILABLE_IN_ALL
GtkAccelGroupEntry* gtk_accel_group_query (GtkAccelGroup *accel_group, GtkAccelGroupEntry* gtk_accel_group_query (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
......
...@@ -81,14 +81,21 @@ struct _GtkAccelLabelClass ...@@ -81,14 +81,21 @@ struct _GtkAccelLabelClass
}; };
GDK_AVAILABLE_IN_ALL
GType gtk_accel_label_get_type (void) G_GNUC_CONST; GType gtk_accel_label_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_accel_label_new (const gchar *string); GtkWidget* gtk_accel_label_new (const gchar *string);
GDK_AVAILABLE_IN_ALL
GtkWidget* gtk_accel_label_get_accel_widget (GtkAccelLabel *accel_label); GtkWidget* gtk_accel_label_get_accel_widget (GtkAccelLabel *accel_label);