diff options
83 files changed, 363 insertions, 370 deletions
diff --git a/gtk/a11y/gail.c b/gtk/a11y/gail.c index 401dccc50e..9c65ade98b 100644 --- a/gtk/a11y/gail.c +++ b/gtk/a11y/gail.c @@ -798,7 +798,7 @@ gail_accessibility_module_init (void) atk_focus_tracker_init (gail_focus_tracker_init); focus_tracker_id = atk_add_focus_tracker (gail_focus_tracker); - gail_util_install (); + _gail_util_install (); atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL); } diff --git a/gtk/a11y/gailmisc.c b/gtk/a11y/gailmisc.c index 9ce021cf01..a0f2fe7a3a 100644 --- a/gtk/a11y/gailmisc.c +++ b/gtk/a11y/gailmisc.c @@ -23,7 +23,7 @@ #include "gailmisc.h" -G_DEFINE_TYPE (GailMisc, gail_misc, ATK_TYPE_MISC) +G_DEFINE_TYPE (GailMisc, _gail_misc, ATK_TYPE_MISC) static void gail_misc_threads_enter (AtkMisc *misc) @@ -38,7 +38,7 @@ gail_misc_threads_leave (AtkMisc *misc) } static void -gail_misc_class_init (GailMiscClass *klass) +_gail_misc_class_init (GailMiscClass *klass) { AtkMiscClass *misc_class = ATK_MISC_CLASS (klass); @@ -47,6 +47,6 @@ gail_misc_class_init (GailMiscClass *klass) } static void -gail_misc_init (GailMisc *misc) +_gail_misc_init (GailMisc *misc) { } diff --git a/gtk/a11y/gailmisc.h b/gtk/a11y/gailmisc.h index 741508bb08..b4ed60f9a8 100644 --- a/gtk/a11y/gailmisc.h +++ b/gtk/a11y/gailmisc.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GAIL_TYPE_MISC (gail_misc_get_type ()) +#define GAIL_TYPE_MISC (_gail_misc_get_type ()) #define GAIL_MISC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MISC, GailMisc)) #define GAIL_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_MISC, GailMiscClass)) #define GAIL_IS_MISC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_MISC)) @@ -44,7 +44,7 @@ struct _GailMiscClass AtkMiscClass parent_class; }; -GType gail_misc_get_type (void); +GType _gail_misc_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gailutil.c b/gtk/a11y/gailutil.c index c59bc3f5b3..7928d18c62 100644 --- a/gtk/a11y/gailutil.c +++ b/gtk/a11y/gailutil.c @@ -487,7 +487,7 @@ gail_util_get_toolkit_version (void) } void -gail_util_install (void) +_gail_util_install (void) { AtkUtilClass *atk_class = ATK_UTIL_CLASS (g_type_class_ref (ATK_TYPE_UTIL)); diff --git a/gtk/a11y/gailutil.h b/gtk/a11y/gailutil.h index 4aa8c8d7d5..d835b17aee 100644 --- a/gtk/a11y/gailutil.h +++ b/gtk/a11y/gailutil.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -void gail_util_install (void); +void _gail_util_install (void); G_END_DECLS diff --git a/gtk/a11y/gtkarrowaccessible.c b/gtk/a11y/gtkarrowaccessible.c index dbff82a487..cd97adf091 100644 --- a/gtk/a11y/gtkarrowaccessible.c +++ b/gtk/a11y/gtkarrowaccessible.c @@ -25,14 +25,14 @@ static void atk_image_interface_init (AtkImageIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, _gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) static void gtk_arrow_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (_gtk_arrow_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_ICON; } @@ -44,11 +44,11 @@ gtk_arrow_accessible_finalize (GObject *object) g_free (arrow->image_description); - G_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_arrow_accessible_parent_class)->finalize (object); } static void -gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass) +_gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); @@ -59,7 +59,7 @@ gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass) } static void -gtk_arrow_accessible_init (GtkArrowAccessible *arrow) +_gtk_arrow_accessible_init (GtkArrowAccessible *arrow) { arrow->image_description = NULL; } diff --git a/gtk/a11y/gtkarrowaccessible.h b/gtk/a11y/gtkarrowaccessible.h index 39b30c8c78..b287cb10d5 100644 --- a/gtk/a11y/gtkarrowaccessible.h +++ b/gtk/a11y/gtkarrowaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_ARROW_ACCESSIBLE (gtk_arrow_accessible_get_type ()) +#define GTK_TYPE_ARROW_ACCESSIBLE (_gtk_arrow_accessible_get_type ()) #define GTK_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessible)) #define GTK_ARROW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessibleClass)) #define GTK_IS_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkArrowAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType gtk_arrow_accessible_get_type (void); +GType _gtk_arrow_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkboxaccessible.c b/gtk/a11y/gtkboxaccessible.c index 94aae411c0..0044128f69 100644 --- a/gtk/a11y/gtkboxaccessible.c +++ b/gtk/a11y/gtkboxaccessible.c @@ -23,18 +23,18 @@ #include "gtkboxaccessible.h" -G_DEFINE_TYPE (GtkBoxAccessible, gtk_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) +G_DEFINE_TYPE (GtkBoxAccessible, _gtk_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) static void gtk_box_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (gtk_box_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (_gtk_box_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_FILLER; } static void -gtk_box_accessible_class_init (GtkBoxAccessibleClass *klass) +_gtk_box_accessible_class_init (GtkBoxAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -42,6 +42,6 @@ gtk_box_accessible_class_init (GtkBoxAccessibleClass *klass) } static void -gtk_box_accessible_init (GtkBoxAccessible *scale) +_gtk_box_accessible_init (GtkBoxAccessible *scale) { } diff --git a/gtk/a11y/gtkboxaccessible.h b/gtk/a11y/gtkboxaccessible.h index ad0e7d4065..bc36fac106 100644 --- a/gtk/a11y/gtkboxaccessible.h +++ b/gtk/a11y/gtkboxaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_BOX_ACCESSIBLE (gtk_box_accessible_get_type ()) +#define GTK_TYPE_BOX_ACCESSIBLE (_gtk_box_accessible_get_type ()) #define GTK_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessible)) #define GTK_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessibleClass)) #define GTK_IS_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOX_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkBoxAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_box_accessible_get_type (void); +GType _gtk_box_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkbuttonaccessible.c b/gtk/a11y/gtkbuttonaccessible.c index ff3a6b234d..8e363e007a 100644 --- a/gtk/a11y/gtkbuttonaccessible.c +++ b/gtk/a11y/gtkbuttonaccessible.c @@ -27,7 +27,7 @@ static void atk_action_interface_init (AtkActionIface *iface); static void atk_image_interface_init (AtkImageIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, gtk_button_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, _gtk_button_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) @@ -57,7 +57,7 @@ gtk_button_accessible_initialize (AtkObject *obj, { GtkWidget *parent; - ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "state-flags-changed", G_CALLBACK (state_changed_cb), NULL); @@ -145,7 +145,7 @@ gtk_button_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->get_name (obj); if (name != NULL) return name; @@ -192,7 +192,7 @@ gtk_button_accessible_ref_state_set (AtkObject *obj) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->ref_state_set (obj); + state_set = ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->ref_state_set (obj); if ((gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_ACTIVE) != 0) atk_state_set_add_state (state_set, ATK_STATE_ARMED); @@ -218,11 +218,11 @@ gtk_button_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "visible_data_changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_button_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_button_accessible_parent_class)->notify_gtk (obj, pspec); } static void -gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass) +_gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass; @@ -241,7 +241,7 @@ gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass) } static void -gtk_button_accessible_init (GtkButtonAccessible *button) +_gtk_button_accessible_init (GtkButtonAccessible *button) { } diff --git a/gtk/a11y/gtkbuttonaccessible.h b/gtk/a11y/gtkbuttonaccessible.h index 8142028b7d..bdf058905d 100644 --- a/gtk/a11y/gtkbuttonaccessible.h +++ b/gtk/a11y/gtkbuttonaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_BUTTON_ACCESSIBLE (gtk_button_accessible_get_type ()) +#define GTK_TYPE_BUTTON_ACCESSIBLE (_gtk_button_accessible_get_type ()) #define GTK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_ACCESSIBLE, GtkButtonAccessible)) #define GTK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_ACCESSIBLE, GtkButtonAccessibleClass)) #define GTK_IS_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkButtonAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_button_accessible_get_type (void); +GType _gtk_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.c b/gtk/a11y/gtkcheckmenuitemaccessible.c index 7c2a072d62..36627b9245 100644 --- a/gtk/a11y/gtkcheckmenuitemaccessible.c +++ b/gtk/a11y/gtkcheckmenuitemaccessible.c @@ -23,7 +23,7 @@ #include "gtkcheckmenuitemaccessible.h" -G_DEFINE_TYPE (GtkCheckMenuItemAccessible, gtk_check_menu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE) +G_DEFINE_TYPE (GtkCheckMenuItemAccessible, _gtk_check_menu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE) static void toggled_cb (GtkWidget *widget) @@ -43,7 +43,7 @@ static void gtk_check_menu_item_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_check_menu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "toggled", G_CALLBACK (toggled_cb), NULL); @@ -61,7 +61,7 @@ gtk_check_menu_item_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_check_menu_item_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->ref_state_set (accessible); check_menu_item = GTK_CHECK_MENU_ITEM (widget); @@ -102,11 +102,11 @@ gtk_check_menu_item_accessible_notify_gtk (GObject *obj, atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_check_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_check_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); } static void -gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klass) +_gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klass) { GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -118,6 +118,6 @@ gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klas } static void -gtk_check_menu_item_accessible_init (GtkCheckMenuItemAccessible *item) +_gtk_check_menu_item_accessible_init (GtkCheckMenuItemAccessible *item) { } diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.h b/gtk/a11y/gtkcheckmenuitemaccessible.h index 2adc4246ee..afaa1336c2 100644 --- a/gtk/a11y/gtkcheckmenuitemaccessible.h +++ b/gtk/a11y/gtkcheckmenuitemaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE (gtk_check_menu_item_accessible_get_type ()) +#define GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE (_gtk_check_menu_item_accessible_get_type ()) #define GTK_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessible)) #define GTK_CHECK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessibleClass)) #define GTK_IS_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkCheckMenuItemAccessibleClass GtkMenuItemAccessibleClass parent_class; }; -GType gtk_check_menu_item_accessible_get_type (void); +GType _gtk_check_menu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkchecksubmenuitemaccessible.c b/gtk/a11y/gtkchecksubmenuitemaccessible.c index 5126ddcc30..2d8380b532 100644 --- a/gtk/a11y/gtkchecksubmenuitemaccessible.c +++ b/gtk/a11y/gtkchecksubmenuitemaccessible.c @@ -24,7 +24,7 @@ #include "gtkchecksubmenuitemaccessible.h" -G_DEFINE_TYPE (GtkCheckSubmenuItemAccessible, gtk_check_submenu_item_accessible, GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE) +G_DEFINE_TYPE (GtkCheckSubmenuItemAccessible, _gtk_check_submenu_item_accessible, GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE) static void toggled_cb (GtkWidget *widget) @@ -44,7 +44,7 @@ static void gtk_check_submenu_item_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_check_submenu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_check_submenu_item_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "toggled", G_CALLBACK (toggled_cb), NULL); @@ -62,7 +62,7 @@ gtk_check_submenu_item_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_check_submenu_item_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_check_submenu_item_accessible_parent_class)->ref_state_set (accessible); check_menu_item = GTK_CHECK_MENU_ITEM (widget); @@ -103,11 +103,11 @@ gtk_check_submenu_item_accessible_notify_gtk (GObject *obj, atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_check_submenu_item_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_check_submenu_item_accessible_parent_class)->notify_gtk (obj, pspec); } static void -gtk_check_submenu_item_accessible_class_init (GtkCheckSubmenuItemAccessibleClass *klass) +_gtk_check_submenu_item_accessible_class_init (GtkCheckSubmenuItemAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -119,6 +119,6 @@ gtk_check_submenu_item_accessible_class_init (GtkCheckSubmenuItemAccessibleClass } static void -gtk_check_submenu_item_accessible_init (GtkCheckSubmenuItemAccessible *item) +_gtk_check_submenu_item_accessible_init (GtkCheckSubmenuItemAccessible *item) { } diff --git a/gtk/a11y/gtkchecksubmenuitemaccessible.h b/gtk/a11y/gtkchecksubmenuitemaccessible.h index bc4e8c375c..2c688d7ca4 100644 --- a/gtk/a11y/gtkchecksubmenuitemaccessible.h +++ b/gtk/a11y/gtkchecksubmenuitemaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE (gtk_check_submenu_item_accessible_get_type ()) +#define GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE (_gtk_check_submenu_item_accessible_get_type ()) #define GTK_CHECK_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE, GtkCheckSubmenuItemAccessible)) #define GTK_CHECK_SUBMENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE, GtkCheckSubmenuItemAccessibleClass)) #define GTK_IS_CHECK_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkCheckSubmenuItemAccessibleClass GtkSubmenuItemAccessibleClass parent_class; }; -GType gtk_check_submenu_item_accessible_get_type (void); +GType _gtk_check_submenu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkcomboboxaccessible.c b/gtk/a11y/gtkcomboboxaccessible.c index 58f8763630..eca7881045 100644 --- a/gtk/a11y/gtkcomboboxaccessible.c +++ b/gtk/a11y/gtkcomboboxaccessible.c @@ -26,7 +26,7 @@ static void atk_action_interface_init (AtkActionIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, _gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) @@ -59,7 +59,7 @@ gtk_combo_box_accessible_initialize (AtkObject *obj, GtkComboBoxAccessible *accessible; AtkObject *popup; - ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->initialize (obj, data); combo_box = GTK_COMBO_BOX (data); accessible = GTK_COMBO_BOX_ACCESSIBLE (obj); @@ -86,10 +86,10 @@ gtk_combo_box_accessible_finalize (GObject *object) g_free (combo_box->name); - G_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->finalize (object); } -static const gchar* +static const gchar * gtk_combo_box_accessible_get_name (AtkObject *obj) { GtkWidget *widget; @@ -101,7 +101,7 @@ gtk_combo_box_accessible_get_name (AtkObject *obj) gint n_columns; gint i; - name = ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->get_name (obj); if (name) return name; @@ -186,7 +186,7 @@ gtk_combo_box_accessible_ref_child (AtkObject *obj, } static void -gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass) +_gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -200,7 +200,7 @@ gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass) } static void -gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box) +_gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box) { combo_box->old_selection = -1; combo_box->name = NULL; @@ -222,18 +222,17 @@ gtk_combo_box_accessible_do_action (AtkAction *action, if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget)) return FALSE; - if (i == 0) - { - combo_box = GTK_COMBO_BOX (widget); - g_object_get (combo_box, "popup-shown", &popup_shown, NULL); - if (popup_shown) - gtk_combo_box_popdown (combo_box); - else - gtk_combo_box_popup (combo_box); - return TRUE; - } - else + if (i != 0) return FALSE; + + combo_box = GTK_COMBO_BOX (widget); + g_object_get (combo_box, "popup-shown", &popup_shown, NULL); + if (popup_shown) + gtk_combo_box_popdown (combo_box); + else + gtk_combo_box_popup (combo_box); + + return TRUE; } static gint diff --git a/gtk/a11y/gtkcomboboxaccessible.h b/gtk/a11y/gtkcomboboxaccessible.h index bb1142d5a5..b662a20935 100644 --- a/gtk/a11y/gtkcomboboxaccessible.h +++ b/gtk/a11y/gtkcomboboxaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_COMBO_BOX_ACCESSIBLE (gtk_combo_box_accessible_get_type ()) +#define GTK_TYPE_COMBO_BOX_ACCESSIBLE (_gtk_combo_box_accessible_get_type ()) #define GTK_COMBO_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_ACCESSIBLE, GtkComboBoxAccessible)) #define GTK_COMBO_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO_BOX_ACCESSIBLE, GtkComboBoxAccessibleClass)) #define GTK_IS_COMBO_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_ACCESSIBLE)) @@ -48,7 +48,7 @@ struct _GtkComboBoxAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_combo_box_accessible_get_type (void); +GType _gtk_combo_box_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkcontaineraccessible.c b/gtk/a11y/gtkcontaineraccessible.c index 844fe841e1..c76f8f3910 100644 --- a/gtk/a11y/gtkcontaineraccessible.c +++ b/gtk/a11y/gtkcontaineraccessible.c @@ -23,12 +23,7 @@ #include "gtkcontaineraccessible.h" -G_DEFINE_TYPE (GtkContainerAccessible, gtk_container_accessible, GTK_TYPE_WIDGET_ACCESSIBLE) - -static void -gtk_container_accessible_init (GtkContainerAccessible *container) -{ -} +G_DEFINE_TYPE (GtkContainerAccessible, _gtk_container_accessible, GTK_TYPE_WIDGET_ACCESSIBLE) static gint gtk_container_accessible_get_n_children (AtkObject* obj) @@ -162,7 +157,7 @@ gtk_container_accessible_real_initialize (AtkObject *obj, { GtkContainerAccessible *accessible = GTK_CONTAINER_ACCESSIBLE (obj); - ATK_OBJECT_CLASS (gtk_container_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_container_accessible_parent_class)->initialize (obj, data); accessible->children = gtk_container_get_children (GTK_CONTAINER (data)); @@ -184,11 +179,11 @@ gtk_container_accessible_finalize (GObject *object) g_list_free (accessible->children); - G_OBJECT_CLASS (gtk_container_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_container_accessible_parent_class)->finalize (object); } static void -gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass) +_gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -202,3 +197,9 @@ gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass) klass->add_gtk = gtk_container_accessible_real_add_gtk; klass->remove_gtk = gtk_container_accessible_real_remove_gtk; } + +static void +_gtk_container_accessible_init (GtkContainerAccessible *container) +{ +} + diff --git a/gtk/a11y/gtkcontaineraccessible.h b/gtk/a11y/gtkcontaineraccessible.h index bb955d2bca..639ff5d5a7 100644 --- a/gtk/a11y/gtkcontaineraccessible.h +++ b/gtk/a11y/gtkcontaineraccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_CONTAINER_ACCESSIBLE (gtk_container_accessible_get_type ()) +#define GTK_TYPE_CONTAINER_ACCESSIBLE (_gtk_container_accessible_get_type ()) #define GTK_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessible)) #define GTK_CONTAINER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessibleClass)) #define GTK_IS_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE)) @@ -53,7 +53,7 @@ struct _GtkContainerAccessibleClass gpointer data); }; -GType gtk_container_accessible_get_type (void); +GType _gtk_container_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkentryaccessible.c b/gtk/a11y/gtkentryaccessible.c index 7e2133981c..e2576a11ef 100644 --- a/gtk/a11y/gtkentryaccessible.c +++ b/gtk/a11y/gtkentryaccessible.c @@ -45,13 +45,13 @@ static void atk_text_interface_init (AtkTextIface *iface); static void atk_action_interface_init (AtkActionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkEntryAccessible, gtk_entry_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkEntryAccessible, _gtk_entry_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) -static AtkStateSet* +static AtkStateSet * gtk_entry_accessible_ref_state_set (AtkObject *accessible) { AtkStateSet *state_set; @@ -62,7 +62,7 @@ gtk_entry_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->ref_state_set (accessible); g_object_get (G_OBJECT (widget), "editable", &value, NULL); if (value) @@ -80,7 +80,7 @@ gtk_entry_accessible_get_attributes (AtkObject *accessible) AtkAttribute *placeholder_text; const gchar *text; - attributes = ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->get_attributes (accessible); + attributes = ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->get_attributes (accessible); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) @@ -107,7 +107,7 @@ gtk_entry_accessible_initialize (AtkObject *obj, GtkEntryAccessible *gtk_entry_accessible; gint start_pos, end_pos; - ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->initialize (obj, data); gtk_entry_accessible = GTK_ENTRY_ACCESSIBLE (obj); @@ -174,7 +174,7 @@ gtk_entry_accessible_notify_gtk (GObject *obj, atk_object_set_role (atk_obj, new_role); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_entry_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_entry_accessible_parent_class)->notify_gtk (obj, pspec); } static gint @@ -188,11 +188,11 @@ gtk_entry_accessible_get_index_in_parent (AtkObject *accessible) if (GTK_IS_COMBO_BOX_ACCESSIBLE (accessible->accessible_parent)) return 1; - return ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->get_index_in_parent (accessible); + return ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->get_index_in_parent (accessible); } static void -gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass) +_gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -206,7 +206,7 @@ gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass) } static void -gtk_entry_accessible_init (GtkEntryAccessible *entry) +_gtk_entry_accessible_init (GtkEntryAccessible *entry) { entry->length_insert = 0; entry->length_delete = 0; diff --git a/gtk/a11y/gtkentryaccessible.h b/gtk/a11y/gtkentryaccessible.h index 9b9c3c2201..de8781a610 100644 --- a/gtk/a11y/gtkentryaccessible.h +++ b/gtk/a11y/gtkentryaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_ENTRY_ACCESSIBLE (gtk_entry_accessible_get_type ()) +#define GTK_TYPE_ENTRY_ACCESSIBLE (_gtk_entry_accessible_get_type ()) #define GTK_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessible)) #define GTK_ENTRY_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessibleClass)) #define GTK_IS_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_ACCESSIBLE)) @@ -51,7 +51,7 @@ struct _GtkEntryAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType gtk_entry_accessible_get_type (void); +GType _gtk_entry_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkexpanderaccessible.c b/gtk/a11y/gtkexpanderaccessible.c index 24a04d97ee..dfc4260e55 100644 --- a/gtk/a11y/gtkexpanderaccessible.c +++ b/gtk/a11y/gtkexpanderaccessible.c @@ -25,7 +25,7 @@ static void atk_action_interface_init (AtkActionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, gtk_expander_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, _gtk_expander_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) static const gchar * @@ -51,7 +51,7 @@ gtk_expander_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->get_name (obj); if (name != NULL) return name; @@ -79,7 +79,7 @@ gtk_expander_accessible_get_n_children (AtkObject *obj) if (gtk_expander_get_label_widget (GTK_EXPANDER (widget))) count -= 1; - return count; + return count; } static AtkObject * @@ -132,7 +132,7 @@ static void gtk_expander_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_TOGGLE_BUTTON; } @@ -162,10 +162,10 @@ gtk_expander_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "visible_data_changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec); } -static AtkStateSet* +static AtkStateSet * gtk_expander_accessible_ref_state_set (AtkObject *obj) { AtkStateSet *state_set; @@ -176,7 +176,7 @@ gtk_expander_accessible_ref_state_set (AtkObject *obj) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->ref_state_set (obj); + state_set = ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->ref_state_set (obj); expander = GTK_EXPANDER (widget); @@ -192,7 +192,7 @@ gtk_expander_accessible_ref_state_set (AtkObject *obj) } static void -gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass) +_gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -208,7 +208,7 @@ gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass) } static void -gtk_expander_accessible_init (GtkExpanderAccessible *expander) +_gtk_expander_accessible_init (GtkExpanderAccessible *expander) { } @@ -226,7 +226,7 @@ gtk_expander_accessible_do_action (AtkAction *action, return FALSE; if (i != 0) - return FALSE; + return FALSE; gtk_widget_activate (widget); return TRUE; diff --git a/gtk/a11y/gtkexpanderaccessible.h b/gtk/a11y/gtkexpanderaccessible.h index 27e2433c21..d740998aff 100644 --- a/gtk/a11y/gtkexpanderaccessible.h +++ b/gtk/a11y/gtkexpanderaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_EXPANDER_ACCESSIBLE (gtk_expander_accessible_get_type ()) +#define GTK_TYPE_EXPANDER_ACCESSIBLE (_gtk_expander_accessible_get_type ()) #define GTK_EXPANDER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER_ACCESSIBLE, GtkExpanderAccessible)) #define GTK_EXPANDER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER_ACCESSIBLE, GtkExpanderAccessibleClass)) #define GTK_IS_EXPANDER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkExpanderAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_expander_accessible_get_type (void); +GType _gtk_expander_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkframeaccessible.c b/gtk/a11y/gtkframeaccessible.c index 03d4f271b8..ca6458daca 100644 --- a/gtk/a11y/gtkframeaccessible.c +++ b/gtk/a11y/gtkframeaccessible.c @@ -24,13 +24,13 @@ #include "gtkframeaccessible.h" -G_DEFINE_TYPE (GtkFrameAccessible, gtk_frame_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) +G_DEFINE_TYPE (GtkFrameAccessible, _gtk_frame_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) static void gtk_frame_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (gtk_frame_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (_gtk_frame_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_PANEL; } @@ -45,7 +45,7 @@ gtk_frame_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (gtk_frame_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (_gtk_frame_accessible_parent_class)->get_name (obj); if (name != NULL) return name; @@ -53,7 +53,7 @@ gtk_frame_accessible_get_name (AtkObject *obj) } static void -gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass) +_gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -62,6 +62,6 @@ gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass) } static void -gtk_frame_accessible_init (GtkFrameAccessible *frame) +_gtk_frame_accessible_init (GtkFrameAccessible *frame) { } diff --git a/gtk/a11y/gtkframeaccessible.h b/gtk/a11y/gtkframeaccessible.h index 78df07268c..4af46e6e56 100644 --- a/gtk/a11y/gtkframeaccessible.h +++ b/gtk/a11y/gtkframeaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_FRAME_ACCESSIBLE (gtk_frame_accessible_get_type ()) +#define GTK_TYPE_FRAME_ACCESSIBLE (_gtk_frame_accessible_get_type ()) #define GTK_FRAME_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FRAME_ACCESSIBLE, GtkFrameAccessible)) #define GTK_FRAME_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAME_ACCESSIBLE, GtkFrameAccessibleClass)) #define GTK_IS_FRAME_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FRAME_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkFrameAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_frame_accessible_get_type (void); +GType _gtk_frame_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkimageaccessible.c b/gtk/a11y/gtkimageaccessible.c index 1432a4c54e..acaa5b9bea 100644 --- a/gtk/a11y/gtkimageaccessible.c +++ b/gtk/a11y/gtkimageaccessible.c @@ -26,14 +26,14 @@ static void atk_image_interface_init (AtkImageIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkImageAccessible, gtk_image_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkImageAccessible, _gtk_image_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) static void gtk_image_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (gtk_image_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (_gtk_image_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_ICON; } @@ -46,7 +46,7 @@ gtk_image_accessible_finalize (GObject *object) g_free (aimage->image_description); g_free (aimage->stock_name); - G_OBJECT_CLASS (gtk_image_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_image_accessible_parent_class)->finalize (object); } static const gchar * @@ -63,7 +63,7 @@ gtk_image_accessible_get_name (AtkObject *accessible) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (gtk_image_accessible_parent_class)->get_name (accessible); + name = ATK_OBJECT_CLASS (_gtk_image_accessible_parent_class)->get_name (accessible); if (name) return name; @@ -88,7 +88,7 @@ gtk_image_accessible_get_name (AtkObject *accessible) } static void -gtk_image_accessible_class_init (GtkImageAccessibleClass *klass) +_gtk_image_accessible_class_init (GtkImageAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -99,7 +99,7 @@ gtk_image_accessible_class_init (GtkImageAccessibleClass *klass) } static void -gtk_image_accessible_init (GtkImageAccessible *image) +_gtk_image_accessible_init (GtkImageAccessible *image) { } diff --git a/gtk/a11y/gtkimageaccessible.h b/gtk/a11y/gtkimageaccessible.h index 3ed2d760ba..ce26b05e8e 100644 --- a/gtk/a11y/gtkimageaccessible.h +++ b/gtk/a11y/gtkimageaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_IMAGE_ACCESSIBLE (gtk_image_accessible_get_type ()) +#define GTK_TYPE_IMAGE_ACCESSIBLE (_gtk_image_accessible_get_type ()) #define GTK_IMAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_ACCESSIBLE, GtkImageAccessible)) #define GTK_IMAGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_ACCESSIBLE, GtkImageAccessibleClass)) #define GTK_IS_IMAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_ACCESSIBLE)) @@ -47,7 +47,7 @@ struct _GtkImageAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType gtk_image_accessible_get_type (void); +GType _gtk_image_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtklabelaccessible.c b/gtk/a11y/gtklabelaccessible.c index fda3f52f6f..963a7c474e 100644 --- a/gtk/a11y/gtklabelaccessible.c +++ b/gtk/a11y/gtklabelaccessible.c @@ -28,11 +28,11 @@ static void atk_text_interface_init (AtkTextIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessible, gtk_label_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessible, _gtk_label_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)) static void -gtk_label_accessible_init (GtkLabelAccessible *label) +_gtk_label_accessible_init (GtkLabelAccessible *label) { } @@ -43,7 +43,7 @@ gtk_label_accessible_initialize (AtkObject *obj, GtkWidget *widget; GtkLabelAccessible *accessible; - ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->initialize (obj, data); accessible = GTK_LABEL_ACCESSIBLE (obj); @@ -119,7 +119,7 @@ gtk_label_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "text_selection_changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_label_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_label_accessible_parent_class)->notify_gtk (obj, pspec); } static void @@ -129,7 +129,7 @@ gtk_label_accessible_finalize (GObject *object) g_free (accessible->text); - G_OBJECT_CLASS (gtk_label_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_label_accessible_parent_class)->finalize (object); } @@ -145,7 +145,7 @@ gtk_label_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->ref_state_set (accessible); atk_state_set_add_state (state_set, ATK_STATE_MULTI_LINE); return state_set; @@ -163,7 +163,7 @@ gtk_label_accessible_ref_relation_set (AtkObject *obj) if (widget == NULL) return NULL; - relation_set = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->ref_relation_set (obj); if (!atk_relation_set_contains (relation_set, ATK_RELATION_LABEL_FOR)) { @@ -222,7 +222,7 @@ gtk_label_accessible_get_name (AtkObject *accessible) g_return_val_if_fail (GTK_IS_LABEL_ACCESSIBLE (accessible), NULL); - name = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->get_name (accessible); + name = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->get_name (accessible); if (name != NULL) return name; else @@ -243,7 +243,7 @@ gtk_label_accessible_get_name (AtkObject *accessible) } static void -gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass) +_gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); diff --git a/gtk/a11y/gtklabelaccessible.h b/gtk/a11y/gtklabelaccessible.h index 90635b7455..0a9fbd60b2 100644 --- a/gtk/a11y/gtklabelaccessible.h +++ b/gtk/a11y/gtklabelaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_LABEL_ACCESSIBLE (gtk_label_accessible_get_type ()) +#define GTK_TYPE_LABEL_ACCESSIBLE (_gtk_label_accessible_get_type ()) #define GTK_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessible)) #define GTK_LABEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessibleClass)) #define GTK_IS_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkLabelAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType gtk_label_accessible_get_type (void); +GType _gtk_label_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtklinkbuttonaccessible.c b/gtk/a11y/gtklinkbuttonaccessible.c index 961b718af5..132cebd570 100644 --- a/gtk/a11y/gtklinkbuttonaccessible.c +++ b/gtk/a11y/gtklinkbuttonaccessible.c @@ -39,7 +39,7 @@ struct _GtkLinkButtonAccessibleLinkClass static void atk_action_interface_init (AtkActionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessibleLink, gtk_link_button_accessible_link, ATK_TYPE_HYPERLINK, +G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessibleLink, _gtk_link_button_accessible_link, ATK_TYPE_HYPERLINK, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) static AtkHyperlink * @@ -47,7 +47,7 @@ gtk_link_button_accessible_link_new (GtkLinkButtonAccessible *button) { GtkLinkButtonAccessibleLink *link; - link = g_object_new (gtk_link_button_accessible_link_get_type (), NULL); + link = g_object_new (_gtk_link_button_accessible_link_get_type (), NULL); link->button = button; return ATK_HYPERLINK (link); @@ -55,7 +55,7 @@ gtk_link_button_accessible_link_new (GtkLinkButtonAccessible *button) static gchar * gtk_link_button_accessible_link_get_uri (AtkHyperlink *link, - gint i) + gint i) { GtkLinkButtonAccessibleLink *l = (GtkLinkButtonAccessibleLink *)link; GtkWidget *widget; @@ -81,7 +81,7 @@ gtk_link_button_accessible_link_is_valid (AtkHyperlink *link) static AtkObject * gtk_link_button_accessible_link_get_object (AtkHyperlink *link, - gint i) + gint i) { GtkLinkButtonAccessibleLink *l = (GtkLinkButtonAccessibleLink *)link; @@ -103,12 +103,12 @@ gtk_link_button_accessible_link_get_end_index (AtkHyperlink *link) } static void -gtk_link_button_accessible_link_init (GtkLinkButtonAccessibleLink *link) +_gtk_link_button_accessible_link_init (GtkLinkButtonAccessibleLink *link) { } static void -gtk_link_button_accessible_link_class_init (GtkLinkButtonAccessibleLinkClass *class) +_gtk_link_button_accessible_link_class_init (GtkLinkButtonAccessibleLinkClass *class) { AtkHyperlinkClass *hyperlink_class = ATK_HYPERLINK_CLASS (class); @@ -122,16 +122,16 @@ gtk_link_button_accessible_link_class_init (GtkLinkButtonAccessibleLinkClass *cl static gboolean gtk_link_button_accessible_link_do_action (AtkAction *action, - gint i) + gint i) { GtkLinkButtonAccessibleLink *link = (GtkLinkButtonAccessibleLink *)action; GtkWidget *widget; widget = GTK_WIDGET (link->button); if (widget == NULL) - /* - * State is defunct - */ + return FALSE; + + if (i != 0) return FALSE; if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget)) @@ -152,7 +152,8 @@ static const gchar * gtk_link_button_accessible_link_get_name (AtkAction *action, gint i) { - g_return_val_if_fail (i == 0, NULL); + if (i != 0) + return NULL; return "activate"; } @@ -166,7 +167,8 @@ atk_action_interface_init (AtkActionIface *iface) } static gboolean -activate_link (GtkLinkButton *button, AtkHyperlink *link) +activate_link (GtkLinkButton *button, + AtkHyperlink *link) { g_signal_emit_by_name (link, "link-activated"); @@ -190,11 +192,11 @@ gtk_link_button_accessible_get_hyperlink (AtkHyperlinkImpl *impl) static void atk_hypertext_impl_interface_init (AtkHyperlinkImplIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessible, gtk_link_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessible, _gtk_link_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_HYPERLINK_IMPL, atk_hypertext_impl_interface_init)) static void -gtk_link_button_accessible_init (GtkLinkButtonAccessible *button) +_gtk_link_button_accessible_init (GtkLinkButtonAccessible *button) { } @@ -206,11 +208,11 @@ gtk_link_button_accessible_finalize (GObject *object) if (button->link) g_object_unref (button->link); - G_OBJECT_CLASS (gtk_link_button_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_link_button_accessible_parent_class)->finalize (object); } static void -gtk_link_button_accessible_class_init (GtkLinkButtonAccessibleClass *klass) +_gtk_link_button_accessible_class_init (GtkLinkButtonAccessibleClass *klass) { G_OBJECT_CLASS (klass)->finalize = gtk_link_button_accessible_finalize; } diff --git a/gtk/a11y/gtklinkbuttonaccessible.h b/gtk/a11y/gtklinkbuttonaccessible.h index 5f3693beb6..bc19ae226c 100644 --- a/gtk/a11y/gtklinkbuttonaccessible.h +++ b/gtk/a11y/gtklinkbuttonaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_LINK_BUTTON_ACCESSIBLE (gtk_link_button_accessible_get_type ()) +#define GTK_TYPE_LINK_BUTTON_ACCESSIBLE (_gtk_link_button_accessible_get_type ()) #define GTK_LINK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessible)) #define GTK_LINK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessibleClass)) #define GTK_IS_LINK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkLinkButtonAccessibleClass GtkButtonAccessibleClass parent_class; }; -GType gtk_link_button_accessible_get_type (void); +GType _gtk_link_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkmenuaccessible.c b/gtk/a11y/gtkmenuaccessible.c index 4f38f6ec22..fb4ac8b32e 100644 --- a/gtk/a11y/gtkmenuaccessible.c +++ b/gtk/a11y/gtkmenuaccessible.c @@ -22,17 +22,17 @@ #include "gtkmenuaccessible.h" -G_DEFINE_TYPE (GtkMenuAccessible, gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE) +G_DEFINE_TYPE (GtkMenuAccessible, _gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE) static void gtk_menu_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_menu_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_menu_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_MENU; - gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_POPUP); + _gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_POPUP); } static AtkObject * @@ -80,11 +80,11 @@ gtk_menu_accessible_get_index_in_parent (AtkObject *accessible) if (gtk_menu_get_attach_widget (GTK_MENU (widget))) return 0; - return ATK_OBJECT_CLASS (gtk_menu_accessible_parent_class)->get_index_in_parent (accessible); + return ATK_OBJECT_CLASS (_gtk_menu_accessible_parent_class)->get_index_in_parent (accessible); } static void -gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass) +_gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -94,6 +94,6 @@ gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass) } static void -gtk_menu_accessible_init (GtkMenuAccessible *accessible) +_gtk_menu_accessible_init (GtkMenuAccessible *accessible) { } diff --git a/gtk/a11y/gtkmenuaccessible.h b/gtk/a11y/gtkmenuaccessible.h index 341a7bea5b..59f29469e8 100644 --- a/gtk/a11y/gtkmenuaccessible.h +++ b/gtk/a11y/gtkmenuaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_MENU_ACCESSIBLE (gtk_menu_accessible_get_type ()) +#define GTK_TYPE_MENU_ACCESSIBLE (_gtk_menu_accessible_get_type ()) #define GTK_MENU_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ACCESSIBLE, GtkMenuAccessible)) #define GTK_MENU_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ACCESSIBLE, GtkMenuAccessibleClass)) #define GTK_IS_MENU_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkMenuAccessibleClass GtkMenuShellAccessibleClass parent_class; }; -GType gtk_menu_accessible_get_type (void); +GType _gtk_menu_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkmenuitemaccessible.c b/gtk/a11y/gtkmenuitemaccessible.c index c4402224ff..71c9931afc 100644 --- a/gtk/a11y/gtkmenuitemaccessible.c +++ b/gtk/a11y/gtkmenuitemaccessible.c @@ -33,7 +33,7 @@ static gchar *get_text_from_label_widget (GtkWidget *widget); static void atk_action_interface_init (AtkActionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkMenuItemAccessible, gtk_menu_item_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkMenuItemAccessible, _gtk_menu_item_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) static void @@ -43,7 +43,7 @@ gtk_menu_item_accessible_initialize (AtkObject *obj, GtkWidget *widget; GtkWidget *parent; - ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "select", G_CALLBACK (menu_item_select), NULL); g_signal_connect (data, "deselect", G_CALLBACK (menu_item_deselect), NULL); @@ -62,7 +62,7 @@ gtk_menu_item_accessible_initialize (AtkObject *obj, atk_object_set_parent (obj, gtk_widget_get_accessible (parent_widget)); } - gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_POPUP); + _gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_POPUP); if (GTK_IS_TEAROFF_MENU_ITEM (data)) obj->role = ATK_ROLE_TEAR_OFF_MENU_ITEM; @@ -133,7 +133,7 @@ gtk_menu_item_accessible_ref_state_set (AtkObject *obj) AtkObject *menu_item; AtkStateSet *state_set, *parent_state_set; - state_set = ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->ref_state_set (obj); + state_set = ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->ref_state_set (obj); menu_item = atk_object_get_parent (obj); @@ -166,7 +166,7 @@ gtk_menu_item_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->get_name (obj); if (name) return name; @@ -186,7 +186,7 @@ gtk_menu_item_accessible_finalize (GObject *object) g_free (accessible->text); - G_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->finalize (object); } static void @@ -204,11 +204,11 @@ gtk_menu_item_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "visible_data_changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); } static void -gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass) +_gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -226,7 +226,7 @@ gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass) } static void -gtk_menu_item_accessible_init (GtkMenuItemAccessible *menu_item) +_gtk_menu_item_accessible_init (GtkMenuItemAccessible *menu_item) { } diff --git a/gtk/a11y/gtkmenuitemaccessible.h b/gtk/a11y/gtkmenuitemaccessible.h index 2c13048280..8c2f5d3be4 100644 --- a/gtk/a11y/gtkmenuitemaccessible.h +++ b/gtk/a11y/gtkmenuitemaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_MENU_ITEM_ACCESSIBLE (gtk_menu_item_accessible_get_type ()) +#define GTK_TYPE_MENU_ITEM_ACCESSIBLE (_gtk_menu_item_accessible_get_type ()) #define GTK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessible)) #define GTK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessibleClass)) #define GTK_IS_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkMenuItemAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_menu_item_accessible_get_type (void); +GType _gtk_menu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkmenushellaccessible.c b/gtk/a11y/gtkmenushellaccessible.c index ba11ddce08..5cdf71ebdd 100644 --- a/gtk/a11y/gtkmenushellaccessible.c +++ b/gtk/a11y/gtkmenushellaccessible.c @@ -25,14 +25,14 @@ static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkMenuShellAccessible, gtk_menu_shell_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkMenuShellAccessible, _gtk_menu_shell_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) static void gtk_menu_shell_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (gtk_menu_shell_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (_gtk_menu_shell_accessible_parent_class)->initialize (accessible, data); if (GTK_IS_MENU_BAR (data)) accessible->role = ATK_ROLE_MENU_BAR; @@ -41,7 +41,7 @@ gtk_menu_shell_accessible_initialize (AtkObject *accessible, } static void -gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass) +_gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); @@ -49,7 +49,7 @@ gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass) } static void -gtk_menu_shell_accessible_init (GtkMenuShellAccessible *menu_shell) +_gtk_menu_shell_accessible_init (GtkMenuShellAccessible *menu_shell) { } diff --git a/gtk/a11y/gtkmenushellaccessible.h b/gtk/a11y/gtkmenushellaccessible.h index b5392e9604..5f14be6be7 100644 --- a/gtk/a11y/gtkmenushellaccessible.h +++ b/gtk/a11y/gtkmenushellaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_MENU_SHELL_ACCESSIBLE (gtk_menu_shell_accessible_get_type ()) +#define GTK_TYPE_MENU_SHELL_ACCESSIBLE (_gtk_menu_shell_accessible_get_type ()) #define GTK_MENU_SHELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessible)) #define GTK_MENU_SHELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessibleClass)) #define GTK_IS_MENU_SHELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkMenuShellAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_menu_shell_accessible_get_type (void); +GType _gtk_menu_shell_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtknotebookaccessible.c b/gtk/a11y/gtknotebookaccessible.c index a26708065d..cf88eb6513 100644 --- a/gtk/a11y/gtknotebookaccessible.c +++ b/gtk/a11y/gtknotebookaccessible.c @@ -27,7 +27,7 @@ static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkNotebookAccessible, gtk_notebook_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkNotebookAccessible, _gtk_notebook_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) static gboolean @@ -92,7 +92,7 @@ create_notebook_page_accessible (GtkNotebookAccessible *accessible, { AtkObject *obj; - obj = gtk_notebook_page_accessible_new (accessible, child); + obj = _gtk_notebook_page_accessible_new (accessible, child); g_hash_table_insert (accessible->pages, child, obj); atk_object_set_parent (obj, ATK_OBJECT (accessible)); g_signal_emit_by_name (accessible, "children_changed::add", page_num, obj, NULL); @@ -127,7 +127,7 @@ page_removed_cb (GtkNotebook *notebook, g_return_if_fail (obj); g_signal_emit_by_name (accessible, "children_changed::remove", page_num, obj, NULL); - gtk_notebook_page_accessible_invalidate (GTK_NOTEBOOK_PAGE_ACCESSIBLE (obj)); + _gtk_notebook_page_accessible_invalidate (GTK_NOTEBOOK_PAGE_ACCESSIBLE (obj)); g_hash_table_remove (accessible->pages, widget); } @@ -151,7 +151,7 @@ gtk_notebook_accessible_initialize (AtkObject *obj, GtkNotebook *notebook; gint i; - ATK_OBJECT_CLASS (gtk_notebook_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_notebook_accessible_parent_class)->initialize (obj, data); accessible = GTK_NOTEBOOK_ACCESSIBLE (obj); notebook = GTK_NOTEBOOK (data); @@ -186,7 +186,7 @@ gtk_notebook_accessible_finalize (GObject *object) if (accessible->idle_focus_id) g_source_remove (accessible->idle_focus_id); - G_OBJECT_CLASS (gtk_notebook_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_notebook_accessible_parent_class)->finalize (object); } static AtkObject * @@ -280,7 +280,7 @@ gtk_notebook_accessible_notify_gtk (GObject *obj, } } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_notebook_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_notebook_accessible_parent_class)->notify_gtk (obj, pspec); } /* @@ -305,7 +305,7 @@ gtk_notebook_accessible_add_selection (AtkSelection *selection, } static void -gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass) +_gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -326,7 +326,7 @@ gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass) } static void -gtk_notebook_accessible_init (GtkNotebookAccessible *notebook) +_gtk_notebook_accessible_init (GtkNotebookAccessible *notebook) { notebook->pages = g_hash_table_new_full (g_direct_hash, g_direct_equal, diff --git a/gtk/a11y/gtknotebookaccessible.h b/gtk/a11y/gtknotebookaccessible.h index 1164bb7749..97c4cfc3ef 100644 --- a/gtk/a11y/gtknotebookaccessible.h +++ b/gtk/a11y/gtknotebookaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_NOTEBOOK_ACCESSIBLE (gtk_notebook_accessible_get_type ()) +#define GTK_TYPE_NOTEBOOK_ACCESSIBLE (_gtk_notebook_accessible_get_type ()) #define GTK_NOTEBOOK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK_ACCESSIBLE, GtkNotebookAccessible)) #define GTK_NOTEBOOK_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_ACCESSIBLE, GtkNotebookAccessibleClass)) #define GTK_IS_NOTEBOOK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_ACCESSIBLE)) @@ -55,7 +55,7 @@ struct _GtkNotebookAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_notebook_accessible_get_type (void); +GType _gtk_notebook_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtknotebookpageaccessible.c b/gtk/a11y/gtknotebookpageaccessible.c index 3b4aaec952..19385042dc 100644 --- a/gtk/a11y/gtknotebookpageaccessible.c +++ b/gtk/a11y/gtknotebookpageaccessible.c @@ -26,7 +26,7 @@ static void atk_component_interface_init (AtkComponentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkNotebookPageAccessible, gtk_notebook_page_accessible, ATK_TYPE_OBJECT, +G_DEFINE_TYPE_WITH_CODE (GtkNotebookPageAccessible, _gtk_notebook_page_accessible, ATK_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) @@ -140,7 +140,7 @@ gtk_notebook_page_accessible_ref_state_set (AtkObject *accessible) AtkObject *atk_label; GtkWidget *label; - state_set = ATK_OBJECT_CLASS (gtk_notebook_page_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_notebook_page_accessible_parent_class)->ref_state_set (accessible); label = get_label_from_notebook_page (GTK_NOTEBOOK_PAGE_ACCESSIBLE (accessible)); if (label) @@ -190,7 +190,7 @@ gtk_notebook_page_accessible_get_index_in_parent (AtkObject *accessible) } static void -gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass) +_gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -203,7 +203,7 @@ gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass) } static void -gtk_notebook_page_accessible_init (GtkNotebookPageAccessible *page) +_gtk_notebook_page_accessible_init (GtkNotebookPageAccessible *page) { } @@ -218,8 +218,8 @@ notify_tab_label (GObject *object, } AtkObject * -gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, - GtkWidget *child) +_gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, + GtkWidget *child) { GObject *object; AtkObject *atk_object; @@ -248,7 +248,7 @@ gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, } void -gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page) +_gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page) { AtkObject *obj = ATK_OBJECT (page); GtkWidget *notebook; diff --git a/gtk/a11y/gtknotebookpageaccessible.h b/gtk/a11y/gtknotebookpageaccessible.h index 7a5fd14f06..c2de93c09c 100644 --- a/gtk/a11y/gtknotebookpageaccessible.h +++ b/gtk/a11y/gtknotebookpageaccessible.h @@ -8,7 +8,7 @@ * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE (gtk_notebook_page_accessible_get_type ()) +#define GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE (_gtk_notebook_page_accessible_get_type ()) #define GTK_NOTEBOOK_PAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GtkNotebookPageAccessible)) #define GTK_NOTEBOOK_PAGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GtkNotebookPageAccessibleClass)) #define GTK_IS_NOTEBOOK_PAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE)) @@ -47,12 +47,12 @@ struct _GtkNotebookPageAccessibleClass AtkObjectClass parent_class; }; -GType gtk_notebook_page_accessible_get_type (void); +GType _gtk_notebook_page_accessible_get_type (void); -AtkObject *gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, - GtkWidget *child); +AtkObject *_gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, + GtkWidget *child); -void gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page); +void _gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page); G_END_DECLS diff --git a/gtk/a11y/gtkpanedaccessible.c b/gtk/a11y/gtkpanedaccessible.c index 40704fd441..4589bf4e17 100644 --- a/gtk/a11y/gtkpanedaccessible.c +++ b/gtk/a11y/gtkpanedaccessible.c @@ -25,7 +25,7 @@ static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkPanedAccessible, gtk_paned_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkPanedAccessible, _gtk_paned_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) static void @@ -41,18 +41,16 @@ static void gtk_paned_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_paned_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_paned_accessible_parent_class)->initialize (obj, data); - g_signal_connect (data, - "size_allocate", - G_CALLBACK (gtk_paned_accessible_size_allocate_gtk), - NULL); + g_signal_connect (data, "size_allocate", + G_CALLBACK (gtk_paned_accessible_size_allocate_gtk), NULL); obj->role = ATK_ROLE_SPLIT_PANE; } static void -gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass) +_gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -60,7 +58,7 @@ gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass) } static void -gtk_paned_accessible_init (GtkPanedAccessible *paned) +_gtk_paned_accessible_init (GtkPanedAccessible *paned) { } @@ -119,13 +117,11 @@ gtk_paned_accessible_get_minimum_value (AtkValue *obj, g_value_set_int (value, minimum_value); } -/* - * Calling atk_value_set_current_value() is no guarantee that the value +/* Calling atk_value_set_current_value() is no guarantee that the value * is acceptable; it is necessary to listen for accessible-value signals * and check whether the current value has been changed or check what the * maximum and minimum values are. */ - static gboolean gtk_paned_accessible_set_current_value (AtkValue *obj, const GValue *value) diff --git a/gtk/a11y/gtkpanedaccessible.h b/gtk/a11y/gtkpanedaccessible.h index 5b73e3e67b..97a14ccab1 100644 --- a/gtk/a11y/gtkpanedaccessible.h +++ b/gtk/a11y/gtkpanedaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_PANED_ACCESSIBLE (gtk_paned_accessible_get_type ()) +#define GTK_TYPE_PANED_ACCESSIBLE (_gtk_paned_accessible_get_type ()) #define GTK_PANED_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED_ACCESSIBLE, GtkPanedAccessible)) #define GTK_PANED_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED_ACCESSIBLE, GtkPanedAccessibleClass)) #define GTK_IS_PANED_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PANED_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkPanedAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_paned_accessible_get_type (void); +GType _gtk_paned_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkprogressbaraccessible.c b/gtk/a11y/gtkprogressbaraccessible.c index bd50c9e23b..0eabca9863 100644 --- a/gtk/a11y/gtkprogressbaraccessible.c +++ b/gtk/a11y/gtkprogressbaraccessible.c @@ -28,14 +28,14 @@ static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkProgressBarAccessible, gtk_progress_bar_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkProgressBarAccessible, _gtk_progress_bar_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) static void gtk_progress_bar_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_progress_bar_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_progress_bar_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_PROGRESS_BAR; } @@ -52,10 +52,11 @@ gtk_progress_bar_accessible_notify_gtk (GObject *obj, if (strcmp (pspec->name, "fraction") == 0) g_object_notify (G_OBJECT (accessible), "accessible-value"); else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_progress_bar_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_progress_bar_accessible_parent_class)->notify_gtk (obj, pspec); } + static void -gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass) +_gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -66,7 +67,7 @@ gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass) } static void -gtk_progress_bar_accessible_init (GtkProgressBarAccessible *bar) +_gtk_progress_bar_accessible_init (GtkProgressBarAccessible *bar) { } diff --git a/gtk/a11y/gtkprogressbaraccessible.h b/gtk/a11y/gtkprogressbaraccessible.h index 370891beaa..6c839cfa3a 100644 --- a/gtk/a11y/gtkprogressbaraccessible.h +++ b/gtk/a11y/gtkprogressbaraccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_PROGRESS_BAR_ACCESSIBLE (gtk_progress_bar_accessible_get_type ()) +#define GTK_TYPE_PROGRESS_BAR_ACCESSIBLE (_gtk_progress_bar_accessible_get_type ()) #define GTK_PROGRESS_BAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE, GtkProgressBarAccessible)) #define GTK_PROGRESS_BAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE, GtkProgressBarAccessibleClass)) #define GTK_IS_PROGRESS_BAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkProgressBarAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType gtk_progress_bar_accessible_get_type (void); +GType _gtk_progress_bar_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkradiobuttonaccessible.c b/gtk/a11y/gtkradiobuttonaccessible.c index b38cb95f6e..f7f150d401 100644 --- a/gtk/a11y/gtkradiobuttonaccessible.c +++ b/gtk/a11y/gtkradiobuttonaccessible.c @@ -23,13 +23,13 @@ #include "gtkradiobuttonaccessible.h" -G_DEFINE_TYPE (GtkRadioButtonAccessible, gtk_radio_button_accessible, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE) +G_DEFINE_TYPE (GtkRadioButtonAccessible, _gtk_radio_button_accessible, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE) static void gtk_radio_button_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (gtk_radio_button_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (_gtk_radio_button_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_RADIO_BUTTON; } @@ -48,7 +48,7 @@ gtk_radio_button_accessible_ref_relation_set (AtkObject *obj) radio_button = GTK_RADIO_BUTTON_ACCESSIBLE (obj); - relation_set = ATK_OBJECT_CLASS (gtk_radio_button_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (_gtk_radio_button_accessible_parent_class)->ref_relation_set (obj); /* If the radio button'group has changed remove the relation */ list = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget)); @@ -100,7 +100,7 @@ gtk_radio_button_accessible_ref_relation_set (AtkObject *obj) } static void -gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass) +_gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -109,8 +109,7 @@ gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass) } static void -gtk_radio_button_accessible_init (GtkRadioButtonAccessible *radio_button) +_gtk_radio_button_accessible_init (GtkRadioButtonAccessible *radio_button) { radio_button->old_group = NULL; } - diff --git a/gtk/a11y/gtkradiobuttonaccessible.h b/gtk/a11y/gtkradiobuttonaccessible.h index 8caa6d2ef7..a6e21433a7 100644 --- a/gtk/a11y/gtkradiobuttonaccessible.h +++ b/gtk/a11y/gtkradiobuttonaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RADIO_BUTTON_ACCESSIBLE (gtk_radio_button_accessible_get_type ()) +#define GTK_TYPE_RADIO_BUTTON_ACCESSIBLE (_gtk_radio_button_accessible_get_type ()) #define GTK_RADIO_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GtkRadioButtonAccessible)) #define GTK_RADIO_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GtkRadioButtonAccessibleClass)) #define GTK_IS_RADIO_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkRadioButtonAccessibleClass GtkToggleButtonAccessibleClass parent_class; }; -GType gtk_radio_button_accessible_get_type (void); +GType _gtk_radio_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkradiomenuitemaccessible.c b/gtk/a11y/gtkradiomenuitemaccessible.c index 508dfcb597..e68d5256c9 100644 --- a/gtk/a11y/gtkradiomenuitemaccessible.c +++ b/gtk/a11y/gtkradiomenuitemaccessible.c @@ -24,7 +24,7 @@ #include "gtkradiosubmenuitemaccessible.h" -G_DEFINE_TYPE (GtkRadioMenuItemAccessible, gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE) +G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE) static AtkRelationSet * gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj) @@ -40,7 +40,7 @@ gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj) radio_menu_item = GTK_RADIO_MENU_ITEM_ACCESSIBLE (obj); - relation_set = ATK_OBJECT_CLASS (gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj); /* If the radio menu_item'group has changed remove the relation */ list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget)); @@ -92,13 +92,13 @@ static void gtk_radio_menu_item_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_radio_menu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_RADIO_MENU_ITEM; } static void -gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass) +_gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -107,6 +107,6 @@ gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klas } static void -gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item) +_gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item) { } diff --git a/gtk/a11y/gtkradiomenuitemaccessible.h b/gtk/a11y/gtkradiomenuitemaccessible.h index b174fd74e0..4c80a51b54 100644 --- a/gtk/a11y/gtkradiomenuitemaccessible.h +++ b/gtk/a11y/gtkradiomenuitemaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE (gtk_radio_menu_item_accessible_get_type ()) +#define GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE (_gtk_radio_menu_item_accessible_get_type ()) #define GTK_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessible)) #define GTK_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass)) #define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkRadioMenuItemAccessibleClass GtkCheckMenuItemAccessibleClass parent_class; }; -GType gtk_radio_menu_item_accessible_get_type (void); +GType _gtk_radio_menu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkradiosubmenuitemaccessible.c b/gtk/a11y/gtkradiosubmenuitemaccessible.c index 617444473f..670a5e59fd 100644 --- a/gtk/a11y/gtkradiosubmenuitemaccessible.c +++ b/gtk/a11y/gtkradiosubmenuitemaccessible.c @@ -23,7 +23,7 @@ #include "gtkradiosubmenuitemaccessible.h" -G_DEFINE_TYPE (GtkRadioSubmenuItemAccessible, gtk_radio_submenu_item_accessible, GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE) +G_DEFINE_TYPE (GtkRadioSubmenuItemAccessible, _gtk_radio_submenu_item_accessible, GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE) static AtkRelationSet * @@ -40,7 +40,7 @@ gtk_radio_submenu_item_accessible_ref_relation_set (AtkObject *obj) radio_menu_item = GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE (obj); - relation_set = ATK_OBJECT_CLASS (gtk_radio_submenu_item_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (_gtk_radio_submenu_item_accessible_parent_class)->ref_relation_set (obj); /* If the radio menu_item's group has changed remove the relation */ list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget)); @@ -92,13 +92,13 @@ static void gtk_radio_submenu_item_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_radio_submenu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_radio_submenu_item_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_RADIO_MENU_ITEM; } static void -gtk_radio_submenu_item_accessible_class_init (GtkRadioSubmenuItemAccessibleClass *klass) +_gtk_radio_submenu_item_accessible_class_init (GtkRadioSubmenuItemAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -107,7 +107,7 @@ gtk_radio_submenu_item_accessible_class_init (GtkRadioSubmenuItemAccessibleClass } static void -gtk_radio_submenu_item_accessible_init (GtkRadioSubmenuItemAccessible *radio_menu_item) +_gtk_radio_submenu_item_accessible_init (GtkRadioSubmenuItemAccessible *radio_menu_item) { radio_menu_item->old_group = NULL; } diff --git a/gtk/a11y/gtkradiosubmenuitemaccessible.h b/gtk/a11y/gtkradiosubmenuitemaccessible.h index 70666ce2a2..ed2d6c6ba6 100644 --- a/gtk/a11y/gtkradiosubmenuitemaccessible.h +++ b/gtk/a11y/gtkradiosubmenuitemaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE (gtk_radio_submenu_item_accessible_get_type ()) +#define GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE (_gtk_radio_submenu_item_accessible_get_type ()) #define GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE, GtkRadioSubmenuItemAccessible)) #define GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE, GtkRadioSubmenuItemAccessibleClass)) #define GTK_IS_RADIO_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkRadioSubmenuItemAccessibleClass GtkCheckSubmenuItemAccessibleClass parent_class; }; -GType gtk_radio_submenu_item_accessible_get_type (void); +GType _gtk_radio_submenu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkrangeaccessible.c b/gtk/a11y/gtkrangeaccessible.c index 35231cc2dc..c071b66632 100644 --- a/gtk/a11y/gtkrangeaccessible.c +++ b/gtk/a11y/gtkrangeaccessible.c @@ -27,7 +27,7 @@ static void atk_action_interface_init (AtkActionIface *iface); static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, gtk_range_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, _gtk_range_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) @@ -46,7 +46,7 @@ gtk_range_accessible_initialize (AtkObject *obj, GtkAdjustment *adj; GtkRange *gtk_range; - ATK_OBJECT_CLASS (gtk_range_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_range_accessible_parent_class)->initialize (obj, data); gtk_range = GTK_RANGE (data); /* @@ -55,12 +55,9 @@ gtk_range_accessible_initialize (AtkObject *obj, */ adj = gtk_range_get_adjustment (gtk_range); if (adj) - { - g_signal_connect (adj, - "value-changed", - G_CALLBACK (gtk_range_accessible_value_changed), - range); - } + g_signal_connect (adj, "value-changed", + G_CALLBACK (gtk_range_accessible_value_changed), + range); obj->role = ATK_ROLE_SLIDER; } @@ -82,7 +79,7 @@ gtk_range_accessible_finalize (GObject *object) range); } - G_OBJECT_CLASS (gtk_range_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_range_accessible_parent_class)->finalize (object); } static void @@ -97,18 +94,17 @@ gtk_range_accessible_notify_gtk (GObject *obj, { range = gtk_widget_get_accessible (widget); adj = gtk_range_get_adjustment (GTK_RANGE (widget)); - g_signal_connect (adj, - "value-changed", + g_signal_connect (adj, "value-changed", G_CALLBACK (gtk_range_accessible_value_changed), range); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_range_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_range_accessible_parent_class)->notify_gtk (obj, pspec); } static void -gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass) +_gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -122,7 +118,7 @@ gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass) } static void -gtk_range_accessible_init (GtkRangeAccessible *range) +_gtk_range_accessible_init (GtkRangeAccessible *range) { } diff --git a/gtk/a11y/gtkrangeaccessible.h b/gtk/a11y/gtkrangeaccessible.h index d84b8ef7b7..2694178fcd 100644 --- a/gtk/a11y/gtkrangeaccessible.h +++ b/gtk/a11y/gtkrangeaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RANGE_ACCESSIBLE (gtk_range_accessible_get_type ()) +#define GTK_TYPE_RANGE_ACCESSIBLE (_gtk_range_accessible_get_type ()) #define GTK_RANGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RANGE_ACCESSIBLE, GtkRangeAccessible)) #define GTK_RANGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RANGE_ACCESSIBLE, GtkRangeAccessibleClass)) #define GTK_IS_RANGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RANGE_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkRangeAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType gtk_range_accessible_get_type (void); +GType _gtk_range_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkscaleaccessible.c b/gtk/a11y/gtkscaleaccessible.c index 46dbd449da..ebdf147e57 100644 --- a/gtk/a11y/gtkscaleaccessible.c +++ b/gtk/a11y/gtkscaleaccessible.c @@ -22,7 +22,7 @@ #include <gtk/gtk.h> #include "gtkscaleaccessible.h" -G_DEFINE_TYPE (GtkScaleAccessible, gtk_scale_accessible, GTK_TYPE_RANGE_ACCESSIBLE) +G_DEFINE_TYPE (GtkScaleAccessible, _gtk_scale_accessible, GTK_TYPE_RANGE_ACCESSIBLE) static const gchar * gtk_scale_accessible_get_description (AtkObject *object) @@ -38,11 +38,11 @@ gtk_scale_accessible_get_description (AtkObject *object) if (layout) return pango_layout_get_text (layout); - return ATK_OBJECT_CLASS (gtk_scale_accessible_parent_class)->get_description (object); + return ATK_OBJECT_CLASS (_gtk_scale_accessible_parent_class)->get_description (object); } static void -gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass) +_gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -50,6 +50,6 @@ gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass) } static void -gtk_scale_accessible_init (GtkScaleAccessible *scale) +_gtk_scale_accessible_init (GtkScaleAccessible *scale) { } diff --git a/gtk/a11y/gtkscaleaccessible.h b/gtk/a11y/gtkscaleaccessible.h index a677cd6591..af3427e659 100644 --- a/gtk/a11y/gtkscaleaccessible.h +++ b/gtk/a11y/gtkscaleaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SCALE_ACCESSIBLE (gtk_scale_accessible_get_type ()) +#define GTK_TYPE_SCALE_ACCESSIBLE (_gtk_scale_accessible_get_type ()) #define GTK_SCALE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_ACCESSIBLE, GtkScaleAccessible)) #define GTK_SCALE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_ACCESSIBLE, GtkScaleAccessibleClass)) #define GTK_IS_SCALE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkScaleAccessibleClass GtkRangeAccessibleClass parent_class; }; -GType gtk_scale_accessible_get_type (void); +GType _gtk_scale_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkscalebuttonaccessible.c b/gtk/a11y/gtkscalebuttonaccessible.c index 2d0c166e71..bdce4dff8e 100644 --- a/gtk/a11y/gtkscalebuttonaccessible.c +++ b/gtk/a11y/gtkscalebuttonaccessible.c @@ -28,7 +28,7 @@ static void atk_action_interface_init (AtkActionIface *iface); static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkScaleButtonAccessible, gtk_scale_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkScaleButtonAccessible, _gtk_scale_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)); @@ -45,7 +45,7 @@ gtk_scale_button_accessible_initialize (AtkObject *obj, { GtkAdjustment *adjustment; - ATK_OBJECT_CLASS (gtk_scale_button_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_scale_button_accessible_parent_class)->initialize (obj, data); adjustment = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (data)); if (adjustment) @@ -79,12 +79,12 @@ gtk_scale_button_accessible_notify_gtk (GObject *obj, } else { - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_scale_button_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_scale_button_accessible_parent_class)->notify_gtk (obj, pspec); } } static void -gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass) +_gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = GTK_WIDGET_ACCESSIBLE_CLASS (klass); @@ -95,7 +95,7 @@ gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass) } static void -gtk_scale_button_accessible_init (GtkScaleButtonAccessible *button) +_gtk_scale_button_accessible_init (GtkScaleButtonAccessible *button) { } diff --git a/gtk/a11y/gtkscalebuttonaccessible.h b/gtk/a11y/gtkscalebuttonaccessible.h index b1e854eda6..affa380554 100644 --- a/gtk/a11y/gtkscalebuttonaccessible.h +++ b/gtk/a11y/gtkscalebuttonaccessible.h @@ -25,7 +25,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SCALE_BUTTON_ACCESSIBLE (gtk_scale_button_accessible_get_type ()) +#define GTK_TYPE_SCALE_BUTTON_ACCESSIBLE (_gtk_scale_button_accessible_get_type ()) #define GTK_SCALE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE, GtkScaleButtonAccessible)) #define GTK_SCALE_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE, GtkScaleButtonAccessibleClass)) #define GTK_IS_SCALE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkScaleButtonAccessibleClass GtkButtonAccessibleClass parent_class; }; -GType gtk_scale_button_accessible_get_type (void); +GType _gtk_scale_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkscrollbaraccessible.c b/gtk/a11y/gtkscrollbaraccessible.c index d6bb541018..65ca1054ce 100644 --- a/gtk/a11y/gtkscrollbaraccessible.c +++ b/gtk/a11y/gtkscrollbaraccessible.c @@ -23,18 +23,18 @@ #include "gtkscrollbaraccessible.h" -G_DEFINE_TYPE (GtkScrollbarAccessible, gtk_scrollbar_accessible, GTK_TYPE_RANGE_ACCESSIBLE) +G_DEFINE_TYPE (GtkScrollbarAccessible, _gtk_scrollbar_accessible, GTK_TYPE_RANGE_ACCESSIBLE) static void -gtk_scrollbar_accessible_init (GtkScrollbarAccessible *accessible) +_gtk_scrollbar_accessible_init (GtkScrollbarAccessible *accessible) { } static void gtk_scrollbar_accessible_initialize (AtkObject *accessible, - gpointer data) + gpointer data) { - ATK_OBJECT_CLASS (gtk_scrollbar_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (_gtk_scrollbar_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_SCROLL_BAR; } @@ -54,7 +54,7 @@ gtk_scrollbar_accessible_get_index_in_parent (AtkObject *accessible) parent = gtk_widget_get_parent (widget); if (!GTK_IS_SCROLLED_WINDOW (parent)) - return ATK_OBJECT_CLASS (gtk_scrollbar_accessible_parent_class)->get_index_in_parent (accessible); + return ATK_OBJECT_CLASS (_gtk_scrollbar_accessible_parent_class)->get_index_in_parent (accessible); scrolled_window = GTK_SCROLLED_WINDOW (parent); id = 0; @@ -84,7 +84,7 @@ gtk_scrollbar_accessible_get_index_in_parent (AtkObject *accessible) } static void -gtk_scrollbar_accessible_class_init (GtkScrollbarAccessibleClass *klass) +_gtk_scrollbar_accessible_class_init (GtkScrollbarAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); diff --git a/gtk/a11y/gtkscrollbaraccessible.h b/gtk/a11y/gtkscrollbaraccessible.h index afbe80730c..152f9d284d 100644 --- a/gtk/a11y/gtkscrollbaraccessible.h +++ b/gtk/a11y/gtkscrollbaraccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SCROLLBAR_ACCESSIBLE (gtk_scrollbar_accessible_get_type ()) +#define GTK_TYPE_SCROLLBAR_ACCESSIBLE (_gtk_scrollbar_accessible_get_type ()) #define GTK_SCROLLBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR_ACCESSIBLE, GtkScrollbarAccessible)) #define GTK_SCROLLBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLBAR_ACCESSIBLE, GtkScrollbarAccessibleClass)) #define GTK_IS_SCROLLBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLBAR_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkScrollbarAccessibleClass GtkRangeAccessibleClass parent_class; }; -GType gtk_scrollbar_accessible_get_type (void); +GType _gtk_scrollbar_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkscrolledwindowaccessible.c b/gtk/a11y/gtkscrolledwindowaccessible.c index d094909cec..00cbeab874 100644 --- a/gtk/a11y/gtkscrolledwindowaccessible.c +++ b/gtk/a11y/gtkscrolledwindowaccessible.c @@ -24,7 +24,7 @@ #include "gtkscrolledwindowaccessible.h" -G_DEFINE_TYPE (GtkScrolledWindowAccessible, gtk_scrolled_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) +G_DEFINE_TYPE (GtkScrolledWindowAccessible, _gtk_scrolled_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) static void visibility_changed (GObject *object, @@ -84,13 +84,14 @@ visibility_changed (GObject *object, } } + static void gtk_scrolled_window_accessible_initialize (AtkObject *obj, gpointer data) { GtkScrolledWindow *window; - ATK_OBJECT_CLASS (gtk_scrolled_window_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_scrolled_window_accessible_parent_class)->initialize (obj, data); window = GTK_SCROLLED_WINDOW (data); @@ -180,7 +181,7 @@ gtk_scrolled_window_accessible_ref_child (AtkObject *obj, } static void -gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *klass) +_gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -190,6 +191,6 @@ gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *kla } static void -gtk_scrolled_window_accessible_init (GtkScrolledWindowAccessible *window) +_gtk_scrolled_window_accessible_init (GtkScrolledWindowAccessible *window) { } diff --git a/gtk/a11y/gtkscrolledwindowaccessible.h b/gtk/a11y/gtkscrolledwindowaccessible.h index 139c99d83c..ad5e171981 100644 --- a/gtk/a11y/gtkscrolledwindowaccessible.h +++ b/gtk/a11y/gtkscrolledwindowaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE (gtk_scrolled_window_accessible_get_type ()) +#define GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE (_gtk_scrolled_window_accessible_get_type ()) #define GTK_SCROLLED_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE, GtkScrolledWindowAccessible)) #define GTK_SCROLLED_WINDOW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE, GtkScrolledWindowAccessibleClass)) #define GTK_IS_SCROLLED_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkScrolledWindowAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_scrolled_window_accessible_get_type (void); +GType _gtk_scrolled_window_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkspinbuttonaccessible.c b/gtk/a11y/gtkspinbuttonaccessible.c index 85c24e3b1d..df7b2c8339 100644 --- a/gtk/a11y/gtkspinbuttonaccessible.c +++ b/gtk/a11y/gtkspinbuttonaccessible.c @@ -26,7 +26,7 @@ static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkSpinButtonAccessible, gtk_spin_button_accessible, GTK_TYPE_ENTRY_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkSpinButtonAccessible, _gtk_spin_button_accessible, GTK_TYPE_ENTRY_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) static void @@ -49,7 +49,7 @@ gtk_spin_button_accessible_initialize (AtkObject *obj, { GtkAdjustment *adjustment; - ATK_OBJECT_CLASS (gtk_spin_button_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_spin_button_accessible_parent_class)->initialize (obj, data); adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (data)); if (adjustment) @@ -73,19 +73,18 @@ gtk_spin_button_accessible_notify_gtk (GObject *obj, GtkAdjustment* adjustment; adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)); - g_signal_connect (adjustment, - "value-changed", + g_signal_connect (adjustment, "value-changed", G_CALLBACK (gtk_spin_button_accessible_value_changed), spin_button); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec); } static void -gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass) +_gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -96,7 +95,7 @@ gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass) } static void -gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button) +_gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button) { } diff --git a/gtk/a11y/gtkspinbuttonaccessible.h b/gtk/a11y/gtkspinbuttonaccessible.h index 8fb13b0c85..96eb9e86c4 100644 --- a/gtk/a11y/gtkspinbuttonaccessible.h +++ b/gtk/a11y/gtkspinbuttonaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SPIN_BUTTON_ACCESSIBLE (gtk_spin_button_accessible_get_type ()) +#define GTK_TYPE_SPIN_BUTTON_ACCESSIBLE (_gtk_spin_button_accessible_get_type ()) #define GTK_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessible)) #define GTK_SPIN_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessibleClass)) #define GTK_IS_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkSpinButtonAccessibleClass GtkEntryAccessibleClass parent_class; }; -GType gtk_spin_button_accessible_get_type (void); +GType _gtk_spin_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkspinneraccessible.c b/gtk/a11y/gtkspinneraccessible.c index 761ab5ab82..1da24ae8a7 100644 --- a/gtk/a11y/gtkspinneraccessible.c +++ b/gtk/a11y/gtkspinneraccessible.c @@ -30,14 +30,14 @@ static void atk_image_interface_init (AtkImageIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkSpinnerAccessible, gtk_spinner_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkSpinnerAccessible, _gtk_spinner_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)); static void gtk_spinner_accessible_initialize (AtkObject *accessible, gpointer widget) { - ATK_OBJECT_CLASS (gtk_spinner_accessible_parent_class)->initialize (accessible, widget); + ATK_OBJECT_CLASS (_gtk_spinner_accessible_parent_class)->initialize (accessible, widget); atk_object_set_name (accessible, C_("throbbing progress animation widget", "Spinner")); atk_object_set_description (accessible, _("Provides visual indication of progress")); @@ -45,7 +45,7 @@ gtk_spinner_accessible_initialize (AtkObject *accessible, } static void -gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass) +_gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass) { AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); @@ -53,7 +53,7 @@ gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass) } static void -gtk_spinner_accessible_init (GtkSpinnerAccessible *self) +_gtk_spinner_accessible_init (GtkSpinnerAccessible *self) { } diff --git a/gtk/a11y/gtkspinneraccessible.h b/gtk/a11y/gtkspinneraccessible.h index f52cd28e37..49c20f4aca 100644 --- a/gtk/a11y/gtkspinneraccessible.h +++ b/gtk/a11y/gtkspinneraccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SPINNER_ACCESSIBLE (gtk_spinner_accessible_get_type ()) +#define GTK_TYPE_SPINNER_ACCESSIBLE (_gtk_spinner_accessible_get_type ()) #define GTK_SPINNER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPINNER_ACCESSIBLE, GtkSpinnerAccessible)) #define GTK_SPINNER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPINNER_ACCESSIBLE, GtkSpinnerAccessibleClass)) #define GTK_IS_SPINNER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPINNER_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkSpinnerAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType gtk_spinner_accessible_get_type (void); +GType _gtk_spinner_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkstatusbaraccessible.c b/gtk/a11y/gtkstatusbaraccessible.c index 4d92c0d64b..b28d657585 100644 --- a/gtk/a11y/gtkstatusbaraccessible.c +++ b/gtk/a11y/gtkstatusbaraccessible.c @@ -24,7 +24,7 @@ #include "gtkstatusbaraccessible.h" -G_DEFINE_TYPE (GtkStatusbarAccessible, gtk_statusbar_accessible, GTK_TYPE_BOX_ACCESSIBLE) +G_DEFINE_TYPE (GtkStatusbarAccessible, _gtk_statusbar_accessible, GTK_TYPE_BOX_ACCESSIBLE) static void text_changed (GtkStatusbar *statusbar, @@ -43,7 +43,7 @@ gtk_statusbar_accessible_initialize (AtkObject *obj, { GtkWidget *statusbar = data; - ATK_OBJECT_CLASS (gtk_statusbar_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_statusbar_accessible_parent_class)->initialize (obj, data); g_signal_connect_after (statusbar, "text-pushed", G_CALLBACK (text_changed), obj); @@ -102,7 +102,7 @@ gtk_statusbar_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (gtk_statusbar_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (_gtk_statusbar_accessible_parent_class)->get_name (obj); if (name != NULL) return name; @@ -127,7 +127,7 @@ gtk_statusbar_accessible_ref_child (AtkObject *obj, } static void -gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass) +_gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass; @@ -145,6 +145,6 @@ gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass) } static void -gtk_statusbar_accessible_init (GtkStatusbarAccessible *bar) +_gtk_statusbar_accessible_init (GtkStatusbarAccessible *bar) { } diff --git a/gtk/a11y/gtkstatusbaraccessible.h b/gtk/a11y/gtkstatusbaraccessible.h index 941c04c97c..17ce7e05f5 100644 --- a/gtk/a11y/gtkstatusbaraccessible.h +++ b/gtk/a11y/gtkstatusbaraccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_STATUSBAR_ACCESSIBLE (gtk_statusbar_accessible_get_type ()) +#define GTK_TYPE_STATUSBAR_ACCESSIBLE (_gtk_statusbar_accessible_get_type ()) #define GTK_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessible)) #define GTK_STATUSBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessibleClass)) #define GTK_IS_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkStatusbarAccessibleClass GtkBoxAccessibleClass parent_class; }; -GType gtk_statusbar_accessible_get_type (void); +GType _gtk_statusbar_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtksubmenuitemaccessible.c b/gtk/a11y/gtksubmenuitemaccessible.c index 7d0695e6c3..1233183b6f 100644 --- a/gtk/a11y/gtksubmenuitemaccessible.c +++ b/gtk/a11y/gtksubmenuitemaccessible.c @@ -29,7 +29,7 @@ static gint menu_item_remove_gtk (GtkContainer *container, static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkSubmenuItemAccessible, gtk_submenu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkSubmenuItemAccessible, _gtk_submenu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) static void @@ -38,7 +38,7 @@ gtk_submenu_item_accessible_initialize (AtkObject *obj, { GtkWidget *submenu; - ATK_OBJECT_CLASS (gtk_submenu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_submenu_item_accessible_parent_class)->initialize (obj, data); submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (data)); if (submenu) @@ -51,7 +51,7 @@ gtk_submenu_item_accessible_initialize (AtkObject *obj, } static void -gtk_submenu_item_accessible_class_init (GtkSubmenuItemAccessibleClass *klass) +_gtk_submenu_item_accessible_class_init (GtkSubmenuItemAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -59,7 +59,7 @@ gtk_submenu_item_accessible_class_init (GtkSubmenuItemAccessibleClass *klass) } static void -gtk_submenu_item_accessible_init (GtkSubmenuItemAccessible *item) +_gtk_submenu_item_accessible_init (GtkSubmenuItemAccessible *item) { } @@ -93,7 +93,7 @@ gtk_submenu_item_accessible_add_selection (AtkSelection *selection, child = g_list_nth_data (kids, i); g_list_free (kids); - g_return_val_if_fail (GTK_IS_MENU_ITEM(child), FALSE); + g_return_val_if_fail (GTK_IS_MENU_ITEM (child), FALSE); gtk_menu_shell_select_item (shell, GTK_WIDGET (child)); return TRUE; } diff --git a/gtk/a11y/gtksubmenuitemaccessible.h b/gtk/a11y/gtksubmenuitemaccessible.h index 4f7fbba149..6c045d5b78 100644 --- a/gtk/a11y/gtksubmenuitemaccessible.h +++ b/gtk/a11y/gtksubmenuitemaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE (gtk_submenu_item_accessible_get_type ()) +#define GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE (_gtk_submenu_item_accessible_get_type ()) #define GTK_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE, GtkSubmenuItemAccessible)) #define GTK_SUBMENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE, GtkSubmenuItemAccessibleClass)) #define GTK_IS_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkSubmenuItemAccessibleClass GtkMenuItemAccessibleClass parent_class; }; -GType gtk_submenu_item_accessible_get_type (void); +GType _gtk_submenu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkswitchaccessible.c b/gtk/a11y/gtkswitchaccessible.c index 2ca045185b..b49b22354c 100644 --- a/gtk/a11y/gtkswitchaccessible.c +++ b/gtk/a11y/gtkswitchaccessible.c @@ -34,7 +34,7 @@ static void atk_action_interface_init (AtkActionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkSwitchAccessible, gtk_switch_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkSwitchAccessible, _gtk_switch_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) static AtkStateSet * @@ -43,7 +43,7 @@ gtk_switch_accessible_ref_state_set (AtkObject *accessible) AtkStateSet *state_set; GtkWidget *widget; - state_set = ATK_OBJECT_CLASS (gtk_switch_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->ref_state_set (accessible); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) @@ -59,7 +59,7 @@ static void gtk_switch_accessible_initialize (AtkObject *accessible, gpointer widget) { - ATK_OBJECT_CLASS (gtk_switch_accessible_parent_class)->initialize (accessible, widget); + ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->initialize (accessible, widget); atk_object_set_role (accessible, ATK_ROLE_TOGGLE_BUTTON); atk_object_set_name (accessible, C_("light switch widget", "Switch")); @@ -67,7 +67,7 @@ gtk_switch_accessible_initialize (AtkObject *accessible, } static void -gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass) +_gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass) { AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); @@ -76,7 +76,7 @@ gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass) } static void -gtk_switch_accessible_init (GtkSwitchAccessible *self) +_gtk_switch_accessible_init (GtkSwitchAccessible *self) { } diff --git a/gtk/a11y/gtkswitchaccessible.h b/gtk/a11y/gtkswitchaccessible.h index 3cb66a98a1..cad8c85f52 100644 --- a/gtk/a11y/gtkswitchaccessible.h +++ b/gtk/a11y/gtkswitchaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SWITCH_ACCESSIBLE (gtk_switch_accessible_get_type ()) +#define GTK_TYPE_SWITCH_ACCESSIBLE (_gtk_switch_accessible_get_type ()) #define GTK_SWITCH_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SWITCH_ACCESSIBLE, GtkSwitchAccessible)) #define GTK_SWITCH_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SWITCH_ACCESSIBLE, GtkSwitchAccessibleClass)) #define GTK_IS_SWITCH_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SWITCH_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkSwitchAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType gtk_switch_accessible_get_type (void); +GType _gtk_switch_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c index 95ce07e271..809a5a929e 100644 --- a/gtk/a11y/gtktextviewaccessible.c +++ b/gtk/a11y/gtktextviewaccessible.c @@ -49,7 +49,7 @@ static void atk_editable_text_interface_init (AtkEditableTextIface *if static void atk_text_interface_init (AtkTextIface *iface); static void atk_streamable_content_interface_init (AtkStreamableContentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkTextViewAccessible, gtk_text_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkTextViewAccessible, _gtk_text_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_STREAMABLE_CONTENT, atk_streamable_content_interface_init)) @@ -59,7 +59,7 @@ static void gtk_text_view_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_text_view_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_text_view_accessible_parent_class)->initialize (obj, data); setup_buffer (GTK_TEXT_VIEW (data), GTK_TEXT_VIEW_ACCESSIBLE (obj)); @@ -86,7 +86,7 @@ gtk_text_view_accessible_notify_gtk (GObject *obj, setup_buffer (GTK_TEXT_VIEW (obj), GTK_TEXT_VIEW_ACCESSIBLE (atk_obj)); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_text_view_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_text_view_accessible_parent_class)->notify_gtk (obj, pspec); } static AtkStateSet* @@ -99,7 +99,7 @@ gtk_text_view_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_text_view_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_text_view_accessible_parent_class)->ref_state_set (accessible); if (gtk_text_view_get_editable (GTK_TEXT_VIEW (widget))) atk_state_set_add_state (state_set, ATK_STATE_EDITABLE); @@ -109,7 +109,7 @@ gtk_text_view_accessible_ref_state_set (AtkObject *accessible) } static void -gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass) +_gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -121,7 +121,7 @@ gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass) } static void -gtk_text_view_accessible_init (GtkTextViewAccessible *accessible) +_gtk_text_view_accessible_init (GtkTextViewAccessible *accessible) { } diff --git a/gtk/a11y/gtktextviewaccessible.h b/gtk/a11y/gtktextviewaccessible.h index dd1ee9ece9..aacbaa3e18 100644 --- a/gtk/a11y/gtktextviewaccessible.h +++ b/gtk/a11y/gtktextviewaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TEXT_VIEW_ACCESSIBLE (gtk_text_view_accessible_get_type ()) +#define GTK_TYPE_TEXT_VIEW_ACCESSIBLE (_gtk_text_view_accessible_get_type ()) #define GTK_TEXT_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessible)) #define GTK_TEXT_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessibleClass)) #define GTK_IS_TEXT_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE)) @@ -47,7 +47,7 @@ struct _GtkTextViewAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_text_view_accessible_get_type (void); +GType _gtk_text_view_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktogglebuttonaccessible.c b/gtk/a11y/gtktogglebuttonaccessible.c index c18e3f0857..b891aef666 100644 --- a/gtk/a11y/gtktogglebuttonaccessible.c +++ b/gtk/a11y/gtktogglebuttonaccessible.c @@ -24,7 +24,7 @@ #include "gtktogglebuttonaccessible.h" -G_DEFINE_TYPE (GtkToggleButtonAccessible, gtk_toggle_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) +G_DEFINE_TYPE (GtkToggleButtonAccessible, _gtk_toggle_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) static void gtk_toggle_button_accessible_toggled (GtkWidget *widget) @@ -43,7 +43,7 @@ static void gtk_toggle_button_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (gtk_toggle_button_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_toggle_button_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "toggled", G_CALLBACK (gtk_toggle_button_accessible_toggled), NULL); @@ -79,7 +79,7 @@ gtk_toggle_button_accessible_notify_gtk (GObject *obj, atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_toggle_button_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_toggle_button_accessible_parent_class)->notify_gtk (obj, pspec); } static AtkStateSet* @@ -93,7 +93,7 @@ gtk_toggle_button_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_toggle_button_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_toggle_button_accessible_parent_class)->ref_state_set (accessible); toggle_button = GTK_TOGGLE_BUTTON (widget); if (gtk_toggle_button_get_active (toggle_button)) @@ -109,7 +109,7 @@ gtk_toggle_button_accessible_ref_state_set (AtkObject *accessible) } static void -gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass) +_gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -121,6 +121,6 @@ gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass) } static void -gtk_toggle_button_accessible_init (GtkToggleButtonAccessible *button) +_gtk_toggle_button_accessible_init (GtkToggleButtonAccessible *button) { } diff --git a/gtk/a11y/gtktogglebuttonaccessible.h b/gtk/a11y/gtktogglebuttonaccessible.h index dea92d3893..84624e63ea 100644 --- a/gtk/a11y/gtktogglebuttonaccessible.h +++ b/gtk/a11y/gtktogglebuttonaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE (gtk_toggle_button_accessible_get_type ()) +#define GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE (_gtk_toggle_button_accessible_get_type ()) #define GTK_TOGGLE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE, GtkToggleButtonAccessible)) #define GTK_TOGGLE_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE, GtkToggleButtonAccessibleClass)) #define GTK_IS_TOGGLE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkToggleButtonAccessibleClass GtkButtonAccessibleClass parent_class; }; -GType gtk_toggle_button_accessible_get_type (void); +GType _gtk_toggle_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktoplevelaccessible.c b/gtk/a11y/gtktoplevelaccessible.c index 51062e0dcf..4b17274b67 100644 --- a/gtk/a11y/gtktoplevelaccessible.c +++ b/gtk/a11y/gtktoplevelaccessible.c @@ -27,13 +27,13 @@ #include "gtktoplevelaccessible.h" -G_DEFINE_TYPE (GtkToplevelAccessible, gtk_toplevel_accessible, ATK_TYPE_OBJECT) +G_DEFINE_TYPE (GtkToplevelAccessible, _gtk_toplevel_accessible, ATK_TYPE_OBJECT) static void gtk_toplevel_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (gtk_toplevel_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (_gtk_toplevel_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_APPLICATION; accessible->name = g_get_prgname (); @@ -48,7 +48,7 @@ gtk_toplevel_accessible_object_finalize (GObject *obj) if (toplevel->window_list) g_list_free (toplevel->window_list); - G_OBJECT_CLASS (gtk_toplevel_accessible_parent_class)->finalize (obj); + G_OBJECT_CLASS (_gtk_toplevel_accessible_parent_class)->finalize (obj); } static gint @@ -126,7 +126,7 @@ is_attached_menu_window (GtkWidget *widget) } static void -gtk_toplevel_accessible_class_init (GtkToplevelAccessibleClass *klass) +_gtk_toplevel_accessible_class_init (GtkToplevelAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS(klass); GObjectClass *g_object_class = G_OBJECT_CLASS(klass); @@ -237,7 +237,7 @@ hide_event_watcher (GSignalInvocationHint *ihint, } static void -gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel) +_gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel) { GtkWindow *window; GtkWidget *widget; diff --git a/gtk/a11y/gtktoplevelaccessible.h b/gtk/a11y/gtktoplevelaccessible.h index 1a3f59ee03..367cacf12f 100644 --- a/gtk/a11y/gtktoplevelaccessible.h +++ b/gtk/a11y/gtktoplevelaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TOPLEVEL_ACCESSIBLE (gtk_toplevel_accessible_get_type ()) +#define GTK_TYPE_TOPLEVEL_ACCESSIBLE (_gtk_toplevel_accessible_get_type ()) #define GTK_TOPLEVEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOPLEVEL_ACCESSIBLE, GtkToplevelAccessible)) #define GTK_TOPLEVEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOPLEVEL_ACCESSIBLE, GtkToplevelAccessibleClass)) #define GTK_IS_TOPLEVEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOPLEVEL_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkToplevelAccessibleClass AtkObjectClass parent_class; }; -GType gtk_toplevel_accessible_get_type (void); +GType _gtk_toplevel_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c index d6c3d8b345..59f6b9e640 100644 --- a/gtk/a11y/gtktreeviewaccessible.c +++ b/gtk/a11y/gtktreeviewaccessible.c @@ -161,7 +161,7 @@ static void atk_selection_interface_init (AtkSelectionIface *iface); static void atk_component_interface_init (AtkComponentIface *iface); static void gail_cell_parent_interface_init (GailCellParentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkTreeViewAccessible, gtk_tree_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkTreeViewAccessible, _gtk_tree_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE, atk_table_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init) @@ -218,7 +218,7 @@ gtk_tree_view_accessible_initialize (AtkObject *obj, GtkWidget *widget; GtkTreeSelection *selection; - ATK_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->initialize (obj, data); accessible = GTK_TREE_VIEW_ACCESSIBLE (obj); accessible->col_data = NULL; @@ -326,7 +326,7 @@ gtk_tree_view_accessible_finalize (GObject *object) g_array_free (array, TRUE); } - G_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->finalize (object); } static void @@ -396,7 +396,7 @@ gtk_tree_view_accessible_notify_gtk (GObject *obj, g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment_changed), tree_view); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_tree_view_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_tree_view_accessible_parent_class)->notify_gtk (obj, pspec); } static void @@ -447,7 +447,7 @@ gtk_tree_view_accessible_connect_widget_destroyed (GtkAccessible *accessible) g_signal_connect_after (widget, "destroy", G_CALLBACK (gtk_tree_view_accessible_destroyed), accessible); - GTK_ACCESSIBLE_CLASS (gtk_tree_view_accessible_parent_class)->connect_widget_destroyed (accessible); + GTK_ACCESSIBLE_CLASS (_gtk_tree_view_accessible_parent_class)->connect_widget_destroyed (accessible); } static gint @@ -707,7 +707,7 @@ gtk_tree_view_accessible_ref_state_set (AtkObject *obj) AtkStateSet *state_set; GtkWidget *widget; - state_set = ATK_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->ref_state_set (obj); + state_set = ATK_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->ref_state_set (obj); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); if (widget != NULL) @@ -717,7 +717,7 @@ gtk_tree_view_accessible_ref_state_set (AtkObject *obj) } static void -gtk_tree_view_accessible_class_init (GtkTreeViewAccessibleClass *klass) +_gtk_tree_view_accessible_class_init (GtkTreeViewAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -745,7 +745,7 @@ gtk_tree_view_accessible_class_init (GtkTreeViewAccessibleClass *klass) } static void -gtk_tree_view_accessible_init (GtkTreeViewAccessible *view) +_gtk_tree_view_accessible_init (GtkTreeViewAccessible *view) { } @@ -772,7 +772,7 @@ get_focus_index (GtkTreeView *tree_view) /* This function returns a reference to the accessible object * for the cell in the treeview which has focus, if any */ -AtkObject * +static AtkObject * gtk_tree_view_accessible_ref_focus_cell (GtkTreeView *tree_view) { AtkObject *focus_cell = NULL; diff --git a/gtk/a11y/gtktreeviewaccessible.h b/gtk/a11y/gtktreeviewaccessible.h index 64d9d6e241..c8cd70498b 100644 --- a/gtk/a11y/gtktreeviewaccessible.h +++ b/gtk/a11y/gtktreeviewaccessible.h @@ -26,7 +26,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TREE_VIEW_ACCESSIBLE (gtk_tree_view_accessible_get_type ()) +#define GTK_TYPE_TREE_VIEW_ACCESSIBLE (_gtk_tree_view_accessible_get_type ()) #define GTK_TREE_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW_ACCESSIBLE, GtkTreeViewAccessible)) #define GTK_TREE_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_ACCESSIBLE, GtkTreeViewAccessibleClass)) #define GTK_IS_TREE_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_VIEW_ACCESSIBLE)) @@ -61,8 +61,7 @@ struct _GtkTreeViewAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_tree_view_accessible_get_type (void); -AtkObject *gtk_tree_view_accessible_ref_focus_cell (GtkTreeView *treeview); +GType _gtk_tree_view_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c index f7c1fd160e..c85e0e6ab0 100644 --- a/gtk/a11y/gtkwidgetaccessible.c +++ b/gtk/a11y/gtkwidgetaccessible.c @@ -36,7 +36,7 @@ static gboolean gtk_widget_accessible_all_parents_visible (GtkWidget *widget); static void atk_component_interface_init (AtkComponentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkWidgetAccessible, gtk_widget_accessible, GTK_TYPE_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkWidgetAccessible, _gtk_widget_accessible, GTK_TYPE_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) /* Translate GtkWidget::focus-in/out-event to the focus_gtk vfunc */ @@ -270,7 +270,7 @@ gtk_widget_accessible_ref_relation_set (AtkObject *obj) if (widget == NULL) return NULL; - relation_set = ATK_OBJECT_CLASS (gtk_widget_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (_gtk_widget_accessible_parent_class)->ref_relation_set (obj); if (GTK_IS_BOX (widget)) return relation_set; @@ -339,7 +339,7 @@ gtk_widget_accessible_ref_state_set (AtkObject *accessible) GtkWidget *widget; AtkStateSet *state_set; - state_set = ATK_OBJECT_CLASS (gtk_widget_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_widget_accessible_parent_class)->ref_state_set (accessible); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) @@ -549,7 +549,7 @@ gtk_widget_accessible_get_attributes (AtkObject *obj) } static void -gtk_widget_accessible_class_init (GtkWidgetAccessibleClass *klass) +_gtk_widget_accessible_class_init (GtkWidgetAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS (klass); @@ -569,7 +569,7 @@ gtk_widget_accessible_class_init (GtkWidgetAccessibleClass *klass) } static void -gtk_widget_accessible_init (GtkWidgetAccessible *accessible) +_gtk_widget_accessible_init (GtkWidgetAccessible *accessible) { } @@ -656,7 +656,7 @@ gtk_widget_accessible_get_layer (AtkComponent *component) } void -gtk_widget_accessible_set_layer (GtkWidgetAccessible *accessible, +_gtk_widget_accessible_set_layer (GtkWidgetAccessible *accessible, AtkLayer layer) { g_object_set_data (G_OBJECT (accessible), "atk-component-layer", GINT_TO_POINTER (layer)); diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h index 05931ea26d..4b2059bd65 100644 --- a/gtk/a11y/gtkwidgetaccessible.h +++ b/gtk/a11y/gtkwidgetaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_WIDGET_ACCESSIBLE (gtk_widget_accessible_get_type ()) +#define GTK_TYPE_WIDGET_ACCESSIBLE (_gtk_widget_accessible_get_type ()) #define GTK_WIDGET_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessible)) #define GTK_WIDGET_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessibleClass)) #define GTK_IS_WIDGET_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WIDGET_ACCESSIBLE)) @@ -56,10 +56,10 @@ struct _GtkWidgetAccessibleClass }; -GType gtk_widget_accessible_get_type (void); +GType _gtk_widget_accessible_get_type (void); -void gtk_widget_accessible_set_layer (GtkWidgetAccessible *obj, - AtkLayer layer); +void _gtk_widget_accessible_set_layer (GtkWidgetAccessible *obj, + AtkLayer layer); G_END_DECLS diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c index 30ff77b891..c5e2959047 100644 --- a/gtk/a11y/gtkwindowaccessible.c +++ b/gtk/a11y/gtkwindowaccessible.c @@ -56,7 +56,7 @@ static guint gtk_window_accessible_signals [LAST_SIGNAL] = { 0, }; static void atk_component_interface_init (AtkComponentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkWindowAccessible, gtk_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkWindowAccessible, _gtk_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) @@ -85,7 +85,7 @@ gtk_window_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "visible_data_changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (gtk_window_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_window_accessible_parent_class)->notify_gtk (obj, pspec); } static gboolean @@ -111,10 +111,10 @@ gtk_window_accessible_initialize (AtkObject *obj, if (!GTK_IS_WINDOW (widget) && !GTK_IS_HANDLE_BOX (widget)) return; - ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "window_state_event", G_CALLBACK (window_state_event_cb), NULL); - gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_WINDOW); + _gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_WINDOW); if (GTK_IS_FILE_CHOOSER_DIALOG (widget)) obj->role = ATK_ROLE_FILE_CHOOSER; @@ -186,7 +186,7 @@ gtk_window_accessible_get_name (AtkObject *accessible) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->get_name (accessible); + name = ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->get_name (accessible); if (name != NULL) return name; @@ -218,7 +218,7 @@ gtk_window_accessible_get_index_in_parent (AtkObject *accessible) if (widget == NULL) return -1; - index = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->get_index_in_parent (accessible); + index = ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->get_index_in_parent (accessible); if (index != -1) return index; @@ -262,7 +262,7 @@ gtk_window_accessible_ref_relation_set (AtkObject *obj) if (widget == NULL) return NULL; - relation_set = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->ref_relation_set (obj); if (atk_object_get_role (obj) == ATK_ROLE_TOOL_TIP) { @@ -294,7 +294,7 @@ gtk_window_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->ref_state_set (accessible); window = GTK_WINDOW (widget); @@ -318,7 +318,7 @@ gtk_window_accessible_ref_state_set (AtkObject *accessible) } static void -gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass) +_gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass) { GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -407,7 +407,7 @@ gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass) } static void -gtk_window_accessible_init (GtkWindowAccessible *accessible) +_gtk_window_accessible_init (GtkWindowAccessible *accessible) { } diff --git a/gtk/a11y/gtkwindowaccessible.h b/gtk/a11y/gtkwindowaccessible.h index 5c781b3f57..73ba162301 100644 --- a/gtk/a11y/gtkwindowaccessible.h +++ b/gtk/a11y/gtkwindowaccessible.h @@ -24,7 +24,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_WINDOW_ACCESSIBLE (gtk_window_accessible_get_type ()) +#define GTK_TYPE_WINDOW_ACCESSIBLE (_gtk_window_accessible_get_type ()) #define GTK_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW_ACCESSIBLE, GtkWindowAccessible)) #define GTK_WINDOW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW_ACCESSIBLE, GtkWindowAccessibleClass)) #define GTK_IS_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW_ACCESSIBLE)) @@ -44,7 +44,7 @@ struct _GtkWindowAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType gtk_window_accessible_get_type (void); +GType _gtk_window_accessible_get_type (void); G_END_DECLS |