Commit d98622b2 authored by Matthias Clasen's avatar Matthias Clasen

Reduce the number of unwanted exports

_-prefix most of the get_type functions in a11y/.
There are still some more symbols left.
parent 67156524
......@@ -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);
}
......@@ -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)
{
}
......@@ -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
......
......@@ -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));
......
......@@ -24,7 +24,7 @@
G_BEGIN_DECLS
void gail_util_install (void);
void _gail_util_install (void);
G_END_DECLS
......
......@@ -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;
}
......
......@@ -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
......
......@@ -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)
{
}
......@@ -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
......
......@@ -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)
{
}
......
......@@ -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
......
......@@ -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)
{
}
......@@ -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
......
......@@ -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)
{
}
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
{
}
......@@ -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
......
......@@ -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;
......
......@@ -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
......
......@@ -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)