+2007-12-22 Christian Persch <chpe@gnome.org>
+
+ * module/other/gail/*.c: Use G_DEFINE_TYPE[_WITH_CODE] instead of
+ handwritten get_type functions. Bug #504661.
+
2007-12-23 Xan Lopez <xan@gnome.org>
* gtk/gtktreeview.c (gtk_tree_view_build_tree): pass correct argument
static void gail_adjustment_class_init (GailAdjustmentClass *klass);
+static void gail_adjustment_init (GailAdjustment *adjustment);
+
static void gail_adjustment_real_initialize (AtkObject *obj,
gpointer data);
static void gail_adjustment_destroyed (GtkAdjustment *adjustment,
GailAdjustment *gail_adjustment);
-static gpointer parent_class = NULL;
-
-GType
-gail_adjustment_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailAdjustmentClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_adjustment_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailAdjustment), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_value_info =
- {
- (GInterfaceInitFunc) atk_value_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (ATK_TYPE_OBJECT,
- "GailAdjustment", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_VALUE,
- &atk_value_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailAdjustment, gail_adjustment, ATK_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void
gail_adjustment_class_init (GailAdjustmentClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->initialize = gail_adjustment_real_initialize;
}
+static void
+gail_adjustment_init (GailAdjustment *adjustment)
+{
+}
+
AtkObject*
gail_adjustment_new (GtkAdjustment *adjustment)
{
{
GtkAdjustment *adjustment;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_adjustment_parent_class)->initialize (obj, data);
adjustment = GTK_ADJUSTMENT (data);
static void
atk_value_interface_init (AtkValueIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_current_value = gail_adjustment_get_current_value;
iface->get_maximum_value = gail_adjustment_get_maximum_value;
iface->get_minimum_value = gail_adjustment_get_minimum_value;
iface->set_current_value = gail_adjustment_set_current_value;
-
}
static void
#include <gtk/gtk.h>
#include "gailarrow.h"
-static void gail_arrow_class_init (GailArrowClass *klass);
-static void gail_arrow_object_init (GailArrow *arrow);
+static void gail_arrow_class_init (GailArrowClass *klass);
+static void gail_arrow_init (GailArrow *arrow);
/* AtkImage */
static void atk_image_interface_init (AtkImageIface *iface);
const gchar *description);
static void gail_arrow_finalize (GObject *object);
-static GailWidgetClass* parent_class = NULL;
-
-GType
-gail_arrow_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailArrowClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_arrow_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailArrow), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_arrow_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_image_info =
- {
- (GInterfaceInitFunc) atk_image_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailArrow", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_IMAGE,
- &atk_image_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailArrow, gail_arrow, GAIL_TYPE_WIDGET,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
static void
gail_arrow_class_init (GailArrowClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gail_arrow_finalize;
-
- parent_class = g_type_class_peek_parent (klass);
}
static void
-gail_arrow_object_init (GailArrow *arrow)
+gail_arrow_init (GailArrow *arrow)
{
arrow->image_description = NULL;
}
static void
atk_image_interface_init (AtkImageIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_image_description = gail_arrow_get_image_description;
iface->set_image_description = gail_arrow_set_image_description;
}
arrow = GAIL_ARROW (obj);
return arrow->image_description;
-
}
-
static gboolean
gail_arrow_set_image_description (AtkImage *obj,
const gchar *description)
GailArrow *arrow = GAIL_ARROW (object);
g_free (arrow->image_description);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_arrow_parent_class)->finalize (object);
}
#include "gailbooleancell.h"
static void gail_boolean_cell_class_init (GailBooleanCellClass *klass);
-
+static void gail_boolean_cell_init (GailBooleanCell *cell);
/* Misc */
static gboolean gail_boolean_cell_update_cache (GailRendererCell *cell,
NULL
};
-GType
-gail_boolean_cell_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailBooleanCellClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_boolean_cell_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailBooleanCell), /* instance size */
- 0, /* nb preallocs */
- NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_RENDERER_CELL,
- "GailBooleanCell", &tinfo, 0);
- gail_cell_type_add_action_interface (type);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_RENDERER_CELL,
+ gail_cell_type_add_action_interface (g_define_type_id))
static void
gail_boolean_cell_class_init (GailBooleanCellClass *klass)
renderer_cell_class->property_list = gail_boolean_cell_property_list;
}
+static void
+gail_boolean_cell_init (GailBooleanCell *cell)
+{
+}
+
AtkObject*
gail_boolean_cell_new (void)
{
#include <gtk/gtk.h>
#include "gailbox.h"
-static void gail_box_class_init (GailBoxClass *klass);
+static void gail_box_class_init (GailBoxClass *klass);
+static void gail_box_init (GailBox *box);
static AtkStateSet* gail_box_ref_state_set (AtkObject *accessible);
-static GailContainerClass *parent_class = NULL;
-
-GType
-gail_box_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailBoxClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_box_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailBox), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailBox", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailBox, gail_box, GAIL_TYPE_CONTAINER)
static void
gail_box_class_init (GailBoxClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_state_set = gail_box_ref_state_set;
}
+static void
+gail_box_init (GailBox *box)
+{
+}
+
AtkObject*
gail_box_new (GtkWidget *widget)
{
AtkStateSet *state_set;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_box_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
#define GAIL_BUTTON_ATTACHED_MENUS "gtk-attached-menus"
static void gail_button_class_init (GailButtonClass *klass);
-static void gail_button_object_init (GailButton *button);
+static void gail_button_init (GailButton *button);
static G_CONST_RETURN gchar* gail_button_get_name (AtkObject *obj);
static gint gail_button_get_n_children (AtkObject *obj);
static GtkWidget* get_nth_attached_menu (GtkWidget *widget,
gint index);
-static GailContainer* parent_class = NULL;
-
-GType
-gail_button_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailButtonClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_button_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailButton), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_button_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_action_info =
- {
- (GInterfaceInitFunc) atk_action_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_image_info =
- {
- (GInterfaceInitFunc) atk_image_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailButton", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_ACTION,
- &atk_action_info);
- g_type_add_interface_static (type, ATK_TYPE_IMAGE,
- &atk_image_info);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
-
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailButton, gail_button, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void
gail_button_class_init (GailButtonClass *klass)
gobject_class->finalize = gail_button_finalize;
- parent_class = g_type_class_peek_parent (klass);
-
class->get_name = gail_button_get_name;
class->get_n_children = gail_button_get_n_children;
class->ref_child = gail_button_ref_child;
}
static void
-gail_button_object_init (GailButton *button)
+gail_button_init (GailButton *button)
{
button->click_description = NULL;
button->press_description = NULL;
g_return_val_if_fail (GAIL_IS_BUTTON (obj), NULL);
- name = ATK_OBJECT_CLASS (parent_class)->get_name (obj);
+ name = ATK_OBJECT_CLASS (gail_button_parent_class)->get_name (obj);
if (name == NULL)
{
/*
GtkWidget *label;
GtkWidget *widget;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_button_parent_class)->initialize (obj, data);
button->state = GTK_STATE_NORMAL;
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->do_action = gail_button_do_action;
iface->get_n_actions = gail_button_get_n_actions;
iface->get_description = gail_button_get_description;
GtkWidget *widget;
GtkButton *button;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
+ state_set = ATK_OBJECT_CLASS (gail_button_parent_class)->ref_state_set (obj);
widget = GTK_ACCESSIBLE (obj)->widget;
if (widget == NULL)
static void
atk_image_interface_init (AtkImageIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_image_description = gail_button_get_image_description;
iface->get_image_position = gail_button_get_image_position;
iface->get_image_size = gail_button_get_image_size;
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->get_text = gail_button_get_text;
iface->get_character_at_offset = gail_button_get_character_at_offset;
iface->get_text_before_offset = gail_button_get_text_before_offset;
{
g_object_unref (button->textutil);
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_button_parent_class)->finalize (object);
}
static GtkWidget*
#include "gailcalendar.h"
static void gail_calendar_class_init (GailCalendarClass *klass);
+static void gail_calendar_init (GailCalendar *calendar);
-GType
-gail_calendar_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailCalendarClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_calendar_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailCalendar), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
+G_DEFINE_TYPE (GailCalendar, gail_calendar, GAIL_TYPE_WIDGET)
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailCalendar", &tinfo, 0);
- }
- return type;
+static void
+gail_calendar_class_init (GailCalendarClass *klass)
+{
}
static void
-gail_calendar_class_init (GailCalendarClass *klass)
+gail_calendar_init (GailCalendar *calendar)
{
}
static void gail_cell_destroyed (GtkWidget *widget,
GailCell *cell);
-static void gail_cell_object_init (GailCell *cell);
+static void gail_cell_init (GailCell *cell);
static void gail_cell_object_finalize (GObject *cell);
static AtkStateSet* gail_cell_ref_state_set (AtkObject *obj);
static gint gail_cell_get_index_in_parent (AtkObject *obj);
AtkCoordType coord_type);
static gboolean gail_cell_grab_focus (AtkComponent *component);
-static gpointer parent_class = NULL;
-
-GType
-gail_cell_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailCellClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_cell_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailCell), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_cell_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_component_info =
- {
- (GInterfaceInitFunc) atk_component_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
-
- type = g_type_register_static (ATK_TYPE_OBJECT,
- "GailCell", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
- &atk_component_info);
-
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailCell, gail_cell, ATK_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
static void
gail_cell_class_init (GailCellClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
g_object_class->finalize = gail_cell_object_finalize;
class->get_index_in_parent = gail_cell_get_index_in_parent;
}
void
-gail_cell_init (GailCell *cell,
- GtkWidget *widget,
- AtkObject *parent,
- gint index)
+gail_cell_initialise (GailCell *cell,
+ GtkWidget *widget,
+ AtkObject *parent,
+ gint index)
{
g_return_if_fail (GAIL_IS_CELL (cell));
g_return_if_fail (GTK_IS_WIDGET (widget));
}
static void
-gail_cell_object_init (GailCell *cell)
+gail_cell_init (GailCell *cell)
{
cell->state_set = atk_state_set_new ();
cell->widget = NULL;
}
g_object_unref (relation_set);
}
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (gail_cell_parent_class)->finalize (obj);
}
static AtkStateSet *
static void
gail_cell_atk_action_interface_init (AtkActionIface *iface)
{
- g_assert (iface != NULL);
-
iface->get_n_actions = gail_cell_action_get_n_actions;
iface->do_action = gail_cell_action_do_action;
iface->get_name = gail_cell_action_get_name;
void
gail_cell_type_add_action_interface (GType type)
{
- static const GInterfaceInfo atk_action_info =
+ const GInterfaceInfo atk_action_info =
{
(GInterfaceInitFunc) gail_cell_atk_action_interface_init,
(GInterfaceFinalizeFunc) NULL,
static void
atk_component_interface_init (AtkComponentIface *iface)
{
- g_assert (iface != NULL);
-
iface->get_extents = gail_cell_get_extents;
iface->grab_focus = gail_cell_grab_focus;
}
};
-void gail_cell_init (GailCell *cell,
+void gail_cell_initialise (GailCell *cell,
GtkWidget *widget,
AtkObject *parent,
gint index);
GType
gail_cell_parent_get_type (void)
{
- static GType type = 0;
+ static volatile gsize g_define_type_id__volatile = 0;
- if (!type)
+ if (g_once_init_enter (&g_define_type_id__volatile))
{
- static const GTypeInfo tinfo =
- {
- sizeof (GailCellParentIface),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
-
- };
-
- type = g_type_register_static (G_TYPE_INTERFACE, "GailCellParent", &tinfo, 0);
+ GType g_define_type_id =
+ g_type_register_static_simple (G_TYPE_INTERFACE,
+ "GailCellParent",
+ sizeof (GailCellParentIface),
+ NULL,
+ 0,
+ NULL,
+ 0);
+
+ g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
- return type;
+ return g_define_type_id__volatile;
}
/**
static void gail_check_menu_item_class_init (GailCheckMenuItemClass *klass);
+static void gail_check_menu_item_init (GailCheckMenuItem *item);
+
static void gail_check_menu_item_toggled_gtk (GtkWidget *widget);
static void gail_check_menu_item_real_notify_gtk (GObject *obj,
static AtkStateSet* gail_check_menu_item_ref_state_set (AtkObject *accessible);
-static GailMenuItemClass *parent_class = NULL;
-
-GType
-gail_check_menu_item_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailCheckMenuItemClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_check_menu_item_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailCheckMenuItem), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_MENU_ITEM,
- "GailCheckMenuItem", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailCheckMenuItem, gail_check_menu_item, GAIL_TYPE_MENU_ITEM)
static void
gail_check_menu_item_class_init (GailCheckMenuItemClass *klass)
widget_class = (GailWidgetClass*)klass;
widget_class->notify_gtk = gail_check_menu_item_real_notify_gtk;
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_state_set = gail_check_menu_item_ref_state_set;
class->initialize = gail_check_menu_item_real_initialize;
}
+static void
+gail_check_menu_item_init (GailCheckMenuItem *item)
+{
+}
+
AtkObject*
gail_check_menu_item_new (GtkWidget *widget)
{
gail_check_menu_item_real_initialize (AtkObject *obj,
gpointer data)
{
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_check_menu_item_parent_class)->initialize (obj, data);
g_signal_connect (data,
"toggled",
GtkCheckMenuItem *check_menu_item;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_check_menu_item_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED,
!gtk_check_menu_item_get_inconsistent (check_menu_item));
else
- GAIL_WIDGET_CLASS (parent_class)->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_check_menu_item_parent_class)->notify_gtk (obj, pspec);
}
static void gail_check_sub_menu_item_class_init (GailCheckSubMenuItemClass *klass);
+static void gail_check_sub_menu_item_init (GailCheckSubMenuItem *item);
+
static void gail_check_sub_menu_item_toggled_gtk (GtkWidget *widget);
static void gail_check_sub_menu_item_real_notify_gtk (GObject *obj,
static AtkStateSet* gail_check_sub_menu_item_ref_state_set (AtkObject *accessible);
-static GailSubMenuItemClass *parent_class = NULL;
-
-GType
-gail_check_sub_menu_item_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailCheckSubMenuItemClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_check_sub_menu_item_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailCheckSubMenuItem), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_SUB_MENU_ITEM,
- "GailCheckSubMenuItem", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailCheckSubMenuItem, gail_check_sub_menu_item, GAIL_TYPE_SUB_MENU_ITEM)
static void
gail_check_sub_menu_item_class_init (GailCheckSubMenuItemClass *klass)
widget_class = (GailWidgetClass*)klass;
widget_class->notify_gtk = gail_check_sub_menu_item_real_notify_gtk;
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_state_set = gail_check_sub_menu_item_ref_state_set;
class->initialize = gail_check_sub_menu_item_real_initialize;
}
+static void
+gail_check_sub_menu_item_init (GailCheckSubMenuItem *item)
+{
+}
+
AtkObject*
gail_check_sub_menu_item_new (GtkWidget *widget)
{
gail_check_sub_menu_item_real_initialize (AtkObject *obj,
gpointer data)
{
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_check_sub_menu_item_parent_class)->initialize (obj, data);
g_signal_connect (data,
"toggled",
GtkCheckMenuItem *check_menu_item;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_check_sub_menu_item_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED,
!gtk_check_menu_item_get_inconsistent (check_menu_item));
else
- GAIL_WIDGET_CLASS (parent_class)->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_check_sub_menu_item_parent_class)->notify_gtk (obj, pspec);
}
static void gail_clist_class_init (GailCListClass *klass);
+static void gail_clist_init (GailCList *clist);
static void gail_clist_real_initialize (AtkObject *obj,
gpointer data);
static void gail_clist_finalize (GObject *object);
int column_number;
};
-static gpointer parent_class = NULL;
-
-GType
-gail_clist_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailCListClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_clist_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailCList), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_table_info =
- {
- (GInterfaceInitFunc) atk_table_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_selection_info =
- {
- (GInterfaceInitFunc) atk_selection_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo gail_cell_parent_info =
- {
- (GInterfaceInitFunc) gail_cell_parent_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailCList", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_TABLE,
- &atk_table_info);
- g_type_add_interface_static (type, ATK_TYPE_SELECTION,
- &atk_selection_info);
- g_type_add_interface_static (type, GAIL_TYPE_CELL_PARENT,
- &gail_cell_parent_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailCList, gail_clist, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE, atk_table_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)
+ G_IMPLEMENT_INTERFACE (GAIL_TYPE_CELL_PARENT, gail_cell_parent_interface_init))
static void
gail_clist_class_init (GailCListClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->get_n_children = gail_clist_get_n_children;
class->ref_child = gail_clist_ref_child;
class->ref_state_set = gail_clist_ref_state_set;
gobject_class->finalize = gail_clist_finalize;
}
+static void
+gail_clist_init (GailCList *clist)
+{
+}
+
AtkObject*
gail_clist_new (GtkWidget *widget)
{
GtkCList *gtk_clist;
gint i;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_clist_parent_class)->initialize (obj, data);
clist = GAIL_CLIST (obj);
g_list_free (clist->cell_data);
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_clist_parent_class)->finalize (object);
}
static gint
AtkStateSet *state_set;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
+ state_set = ATK_OBJECT_CLASS (gail_clist_parent_class)->ref_state_set (obj);
widget = GTK_ACCESSIBLE (obj)->widget;
if (widget != NULL)
static void
atk_selection_interface_init (AtkSelectionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->clear_selection = gail_clist_clear_selection;
iface->ref_selection = gail_clist_ref_selection;
iface->get_selection_count = gail_clist_get_selection_count;
static void
atk_table_interface_init (AtkTableIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->ref_at = gail_clist_ref_at;
iface->get_index_at = gail_clist_get_index_at;
iface->get_column_at_index = gail_clist_get_column_at_index;
g_return_val_if_fail (ATK_IS_OBJECT (table), NULL);
- gail_cell_init (cell, widget, ATK_OBJECT (table),
- index);
+ gail_cell_initialise (cell, widget, ATK_OBJECT (table),
+ index);
/*
* Store the cell in a cache
*/
static void gail_cell_parent_interface_init (GailCellParentIface *iface)
{
- g_return_if_fail (iface);
-
iface->get_cell_extents = gail_clist_get_cell_extents;
iface->get_cell_area = gail_clist_get_cell_area;
}
#include "gailclistcell.h"
static void gail_clist_cell_class_init (GailCListCellClass *klass);
+static void gail_clist_cell_init (GailCListCell *cell);
static G_CONST_RETURN gchar* gail_clist_cell_get_name (AtkObject *accessible);
-GType
-gail_clist_cell_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailCListCellClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_clist_cell_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailCListCell), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_CELL,
- "GailCListCell", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailCListCell, gail_clist_cell, GAIL_TYPE_CELL)
static void
gail_clist_cell_class_init (GailCListCellClass *klass)
class->get_name = gail_clist_cell_get_name;
}
+static void
+gail_clist_cell_init (GailCListCell *cell)
+{
+}
+
AtkObject*
gail_clist_cell_new (void)
{
#include "gailcombo.h"
static void gail_combo_class_init (GailComboClass *klass);
-static void gail_combo_object_init (GailCombo *combo);
+static void gail_combo_init (GailCombo *combo);
static void gail_combo_real_initialize (AtkObject *obj,
gpointer data);
static gint _gail_combo_popup_release (gpointer data);
-static gpointer parent_class = NULL;
-
-GType
-gail_combo_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailComboClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_combo_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailCombo), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_combo_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_action_info =
- {
- (GInterfaceInitFunc) atk_action_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
- static const GInterfaceInfo atk_selection_info =
- {
- (GInterfaceInitFunc) atk_selection_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailCombo", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_ACTION,
- &atk_action_info);
- g_type_add_interface_static (type, ATK_TYPE_SELECTION,
- &atk_selection_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailCombo, gail_combo, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
static void
gail_combo_class_init (GailComboClass *klass)
gobject_class->finalize = gail_combo_finalize;
- parent_class = g_type_class_peek_parent (klass);
-
class->get_n_children = gail_combo_get_n_children;
class->ref_child = gail_combo_ref_child;
class->initialize = gail_combo_real_initialize;
}
static void
-gail_combo_object_init (GailCombo *combo)
+gail_combo_init (GailCombo *combo)
{
combo->press_description = NULL;
combo->old_selection = NULL;
GList *slist;
GailCombo *gail_combo;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_combo_parent_class)->initialize (obj, data);
combo = GTK_COMBO (data);
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->do_action = gail_combo_do_action;
iface->get_n_actions = gail_combo_get_n_actions;
iface->get_description = gail_combo_get_description;
static void
atk_selection_interface_init (AtkSelectionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->add_selection = gail_combo_add_selection;
iface->clear_selection = gail_combo_clear_selection;
iface->ref_selection = gail_combo_ref_selection;
g_source_remove (combo->select_idle_handler);
combo->select_idle_handler = 0;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_combo_parent_class)->finalize (object);
}
#include <gdk/gdkkeysyms.h>
#include "gailcombobox.h"
-#if GTK_MINOR_VERSION > 4
-#define GAIL_COMBOX_BOX_A11y_COMPLETE
-#endif
-
static void gail_combo_box_class_init (GailComboBoxClass *klass);
-static void gail_combo_box_object_init (GailComboBox *combo_box);
+static void gail_combo_box_init (GailComboBox *combo_box);
static void gail_combo_box_real_initialize (AtkObject *obj,
gpointer data);
static AtkObject* gail_combo_box_ref_child (AtkObject *obj,
gint i);
static void gail_combo_box_finalize (GObject *object);
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
static void atk_action_interface_init (AtkActionIface *iface);
static gboolean gail_combo_box_do_action (AtkAction *action,
gint i);
static gboolean idle_do_action (gpointer data);
-static gint gail_combo_box_get_n_actions (AtkAction *action)
-;
+static gint gail_combo_box_get_n_actions (AtkAction *action);
static G_CONST_RETURN gchar* gail_combo_box_get_description(AtkAction *action,
gint i);
static G_CONST_RETURN gchar* gail_combo_box_get_keybinding (AtkAction *action,
static gboolean gail_combo_box_set_description(AtkAction *action,
gint i,
const gchar *desc);
-#endif
-
static void atk_selection_interface_init (AtkSelectionIface *iface);
static gboolean gail_combo_box_add_selection (AtkSelection *selection,
gint i);
static gboolean gail_combo_box_remove_selection (AtkSelection *selection,
gint i);
-static gpointer parent_class = NULL;
-
-GType
-gail_combo_box_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailComboBoxClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_combo_box_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailComboBox), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_combo_box_object_init, /* instance init */
- NULL /* value table */
- };
-
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
- static const GInterfaceInfo atk_action_info =
- {
- (GInterfaceInitFunc) atk_action_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-#endif
- static const GInterfaceInfo atk_selection_info =
- {
- (GInterfaceInitFunc) atk_selection_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailComboBox", &tinfo, 0);
-
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
- g_type_add_interface_static (type, ATK_TYPE_ACTION,
- &atk_action_info);
-#endif
- g_type_add_interface_static (type, ATK_TYPE_SELECTION,
- &atk_selection_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailComboBox, gail_combo_box, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
static void
gail_combo_box_class_init (GailComboBoxClass *klass)
gobject_class->finalize = gail_combo_box_finalize;
- parent_class = g_type_class_peek_parent (klass);
-
class->get_name = gail_combo_box_get_name;
class->get_n_children = gail_combo_box_get_n_children;
class->ref_child = gail_combo_box_ref_child;
}
static void
-gail_combo_box_object_init (GailComboBox *combo_box)
+gail_combo_box_init (GailComboBox *combo_box)
{
combo_box->press_description = NULL;
combo_box->press_keybinding = NULL;
{
GtkComboBox *combo_box;
GailComboBox *gail_combo_box;
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
AtkObject *popup;
-#endif
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_combo_box_parent_class)->initialize (obj, data);
combo_box = GTK_COMBO_BOX (data);
NULL);
gail_combo_box->old_selection = gtk_combo_box_get_active (combo_box);
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
popup = gtk_combo_box_get_popup_accessible (combo_box);
if (popup)
{
}
if (GTK_IS_COMBO_BOX_ENTRY (combo_box))
atk_object_set_parent (gtk_widget_get_accessible (gtk_bin_get_child (GTK_BIN (combo_box))), obj);
-#endif
obj->role = ATK_ROLE_COMBO_BOX;
}
g_return_val_if_fail (GAIL_IS_COMBO_BOX (obj), NULL);
- name = ATK_OBJECT_CLASS (parent_class)->get_name (obj);
+ name = ATK_OBJECT_CLASS (gail_combo_box_parent_class)->get_name (obj);
if (name)
return name;
*/
return 0;
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
n_children++;
if (GTK_IS_COMBO_BOX_ENTRY (widget))
n_children ++;
-#endif
return n_children;
}
gint i)
{
GtkWidget *widget;
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
AtkObject *child;
GailComboBox *box;
-#endif
g_return_val_if_fail (GAIL_IS_COMBO_BOX (obj), NULL);
*/
return NULL;
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
if (i == 0)
{
child = gtk_combo_box_get_popup_accessible (GTK_COMBO_BOX (widget));
return NULL;
}
return g_object_ref (child);
-#else
- return NULL;
-#endif
}
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->do_action = gail_combo_box_do_action;
iface->get_n_actions = gail_combo_box_get_n_actions;
iface->get_description = gail_combo_box_get_description;
else
return FALSE;
}
-#endif
static void
atk_selection_interface_init (AtkSelectionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->add_selection = gail_combo_box_add_selection;
iface->clear_selection = gail_combo_box_clear_selection;
iface->ref_selection = gail_combo_box_ref_selection;
{
GtkComboBox *combo_box;
GtkWidget *widget;
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
AtkObject *obj;
gint index;
-#endif
widget = GTK_ACCESSIBLE (selection)->widget;
if (widget == NULL)
if (i != 0)
return NULL;
-#ifdef GAIL_COMBOX_BOX_A11y_COMPLETE
obj = gtk_combo_box_get_popup_accessible (combo_box);
index = gtk_combo_box_get_active (combo_box);
return atk_object_ref_accessible_child (obj, index);
-#else
- return NULL;
-#endif
}
static gint
g_source_remove (combo_box->action_idle_handler);
combo_box->action_idle_handler = 0;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_combo_box_parent_class)->finalize (object);
}
#include "gailcontainer.h"
static void gail_container_class_init (GailContainerClass *klass);
-static void gail_container_object_init (GailContainer *container);
+static void gail_container_init (GailContainer *container);
static gint gail_container_get_n_children (AtkObject *obj);
static AtkObject* gail_container_ref_child (AtkObject *obj,
static void gail_container_finalize (GObject *object);
-static GailWidgetClass *parent_class = NULL;
-
-GType
-gail_container_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailContainerClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_container_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailContainer), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_container_object_init, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailContainer", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailContainer, gail_container, GAIL_TYPE_WIDGET)
static void
gail_container_class_init (GailContainerClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class->finalize = gail_container_finalize;
class->get_n_children = gail_container_get_n_children;
}
static void
-gail_container_object_init (GailContainer *container)
+gail_container_init (GailContainer *container)
{
container->children = NULL;
}
GailContainer *container = GAIL_CONTAINER (obj);
guint handler_id;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_container_parent_class)->initialize (obj, data);
container->children = gtk_container_get_children (GTK_CONTAINER (data));
GailContainer *container = GAIL_CONTAINER (object);
g_list_free (container->children);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_container_parent_class)->finalize (object);
}
#include "gailcontainercell.h"
static void gail_container_cell_class_init (GailContainerCellClass *klass);
+static void gail_container_cell_init (GailContainerCell *cell);
static void gail_container_cell_finalize (GObject *obj);
static AtkObject* gail_container_cell_ref_child (AtkObject *obj,
gint child);
-static gpointer parent_class = NULL;
-
-GType
-gail_container_cell_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailContainerCellClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_container_cell_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailContainerCell), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_CELL,
- "GailContainerCell", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailContainerCell, gail_container_cell, GAIL_TYPE_CELL)
static void
gail_container_cell_class_init (GailContainerCellClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS(klass);
GObjectClass *g_object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
g_object_class->finalize = gail_container_cell_finalize;
class->get_n_children = gail_container_cell_get_n_children;
class->ref_child = gail_container_cell_ref_child;
}
+static void
+gail_container_cell_init (GailContainerCell *cell)
+{
+}
GailContainerCell *
gail_container_cell_new (void)
}
g_list_free (container->children);
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (gail_container_cell_parent_class)->finalize (obj);
}
#include <libgail-util/gailmisc.h>
static void gail_entry_class_init (GailEntryClass *klass);
-static void gail_entry_object_init (GailEntry *entry);
+static void gail_entry_init (GailEntry *entry);
static void gail_entry_real_initialize (AtkObject *obj,
gpointer data);
static void text_setup (GailEntry *entry,
gint i,
const gchar *desc);
-static GailWidgetClass *parent_class = NULL;
-
typedef struct _GailEntryPaste GailEntryPaste;
struct _GailEntryPaste
gint position;
};
-GType
-gail_entry_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailEntryClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_entry_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailEntry), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_entry_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_editable_text_info =
- {
- (GInterfaceInitFunc) atk_editable_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_action_info =
- {
- (GInterfaceInitFunc) atk_action_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailEntry", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT,
- &atk_editable_text_info);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- g_type_add_interface_static (type, ATK_TYPE_ACTION,
- &atk_action_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailEntry, gail_entry, GAIL_TYPE_WIDGET,
+ 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 void
gail_entry_class_init (GailEntryClass *klass)
widget_class = (GailWidgetClass*)klass;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class->finalize = gail_entry_finalize;
class->ref_state_set = gail_entry_ref_state_set;
}
static void
-gail_entry_object_init (GailEntry *entry)
+gail_entry_init (GailEntry *entry)
{
entry->textutil = NULL;
entry->signal_name_insert = NULL;
GtkEntry *entry;
GailEntry *gail_entry;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_entry_parent_class)->initialize (obj, data);
gail_entry = GAIL_ENTRY (obj);
gail_entry->textutil = gail_text_util_new ();
text_setup (entry, gtk_entry);
}
else
- parent_class->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_entry_parent_class)->notify_gtk (obj, pspec);
}
static void
g_source_remove (entry->insert_idle_handler);
entry->insert_idle_handler = 0;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_entry_parent_class)->finalize (object);
}
AtkObject*
GAIL_IS_COMBO_BOX (accessible->accessible_parent))
return 1;
- return ATK_OBJECT_CLASS (parent_class)->get_index_in_parent (accessible);
+ return ATK_OBJECT_CLASS (gail_entry_parent_class)->get_index_in_parent (accessible);
}
/* atkobject.h */
gboolean value;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_entry_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_text = gail_entry_get_text;
iface->get_character_at_offset = gail_entry_get_character_at_offset;
iface->get_text_before_offset = gail_entry_get_text_before_offset;
static void
atk_editable_text_interface_init (AtkEditableTextIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->set_text_contents = gail_entry_set_text_contents;
iface->insert_text = gail_entry_insert_text;
iface->copy_text = gail_entry_copy_text;
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->do_action = gail_entry_do_action;
iface->get_n_actions = gail_entry_get_n_actions;
iface->get_description = gail_entry_get_description;
#include <libgail-util/gailmisc.h>
static void gail_expander_class_init (GailExpanderClass *klass);
-static void gail_expander_object_init (GailExpander *expander);
+static void gail_expander_init (GailExpander *expander);
static G_CONST_RETURN gchar* gail_expander_get_name (AtkObject *obj);
static gint gail_expander_get_n_children (AtkObject *obj)
static AtkAttributeSet* gail_expander_get_default_attributes
(AtkText *text);
-static GailContainer* parent_class = NULL;
-
-GType
-gail_expander_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailExpanderClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_expander_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailExpander), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_expander_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_action_info =
- {
- (GInterfaceInitFunc) atk_action_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailExpander", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_ACTION,
- &atk_action_info);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
-
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailExpander, gail_expander, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void
gail_expander_class_init (GailExpanderClass *klass)
gobject_class->finalize = gail_expander_finalize;
- parent_class = g_type_class_peek_parent (klass);
-
class->get_name = gail_expander_get_name;
class->get_n_children = gail_expander_get_n_children;
class->ref_child = gail_expander_ref_child;
}
static void
-gail_expander_object_init (GailExpander *expander)
+gail_expander_init (GailExpander *expander)
{
expander->activate_description = NULL;
expander->activate_keybinding = NULL;
G_CONST_RETURN gchar *name;
g_return_val_if_fail (GAIL_IS_EXPANDER (obj), NULL);
- name = ATK_OBJECT_CLASS (parent_class)->get_name (obj);
+ name = ATK_OBJECT_CLASS (gail_expander_parent_class)->get_name (obj);
if (name != NULL)
return name;
else
GailExpander *gail_expander = GAIL_EXPANDER (obj);
GtkWidget *expander;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_expander_parent_class)->initialize (obj, data);
expander = GTK_WIDGET (data);
if (GTK_WIDGET_MAPPED (expander))
g_signal_emit_by_name (atk_obj, "visible_data_changed");
}
else
- GAIL_WIDGET_CLASS (parent_class)->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_expander_parent_class)->notify_gtk (obj, pspec);
}
static void
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->do_action = gail_expander_do_action;
iface->get_n_actions = gail_expander_get_n_actions;
iface->get_description = gail_expander_get_description;
GtkWidget *widget;
GtkExpander *expander;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
+ state_set = ATK_OBJECT_CLASS (gail_expander_parent_class)->ref_state_set (obj);
widget = GTK_ACCESSIBLE (obj)->widget;
if (widget == NULL)
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->get_text = gail_expander_get_text;
iface->get_character_at_offset = gail_expander_get_character_at_offset;
iface->get_text_before_offset = gail_expander_get_text_before_offset;
if (expander->textutil)
g_object_unref (expander->textutil);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_expander_parent_class)->finalize (object);
}
#include "gailframe.h"
static void gail_frame_class_init (GailFrameClass *klass);
+static void gail_frame_init (GailFrame *frame);
static G_CONST_RETURN gchar* gail_frame_get_name (AtkObject *obj);
-static gpointer parent_class = NULL;
-
-GType
-gail_frame_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailFrameClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_frame_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailFrame), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailFrame", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailFrame, gail_frame, GAIL_TYPE_CONTAINER)
static void
gail_frame_class_init (GailFrameClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
class->get_name = gail_frame_get_name;
+}
- parent_class = g_type_class_peek_parent (klass);
+static void
+gail_frame_init (GailFrame *frame)
+{
}
AtkObject*
G_CONST_RETURN gchar *name;
g_return_val_if_fail (GAIL_IS_FRAME (obj), NULL);
- name = ATK_OBJECT_CLASS (parent_class)->get_name (obj);
+ name = ATK_OBJECT_CLASS (gail_frame_parent_class)->get_name (obj);
if (name != NULL)
{
return name;
static void gail_html_box_remove_focus_handler (AtkComponent *component,
guint handler_id);
-static AtkGObjectClass *parent_class = NULL;
-
-GType
-gail_html_box_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailHtmlBoxClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_html_box_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailHtmlBox), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_component_info =
- {
- (GInterfaceInitFunc) gail_html_box_component_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (ATK_TYPE_GOBJECT,
- "GailHtmlBox", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
- &atk_component_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailHtmlBox, gail_html_box, ATK_TYPE_GOBJECT,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, gail_html_box_component_interface_init))
static void
gail_html_box_class_init (GailHtmlBoxClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_ref (ATK_TYPE_GOBJECT);
-
class->get_index_in_parent = gail_html_box_get_index_in_parent;
class->ref_state_set = gail_html_box_ref_state_set;
class->initialize = gail_html_box_initialize;
gpointer data)
{
HtmlBox *box;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_html_box_parent_class)->initialize (obj, data);
box = HTML_BOX (data);
g_return_val_if_fail (GAIL_IS_HTML_BOX (obj), NULL);
atk_gobj = ATK_GOBJECT (obj);
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
+ state_set = ATK_OBJECT_CLASS (gail_html_box_parent_class)->ref_state_set (obj);
g_obj = atk_gobject_get_object (atk_gobj);
if (g_obj == NULL)
static void
gail_html_box_component_interface_init (AtkComponentIface *iface)
{
- g_return_if_fail (iface != NULL);
-
/*
* Use default implementation for contains and get_position
*/
static AtkObject* gail_html_box_block_ref_child (AtkObject *obj,
gint i);
-static GailHtmlBoxClass *parent_class = NULL;
-
-GType
-gail_html_box_block_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailHtmlBoxBlockClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_html_box_block_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailHtmlBoxBlock), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_HTML_BOX,
- "GailHtmlBoxBlock", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailHtmlBoxBlock, gail_html_box_block, GAIL_TYPE_HTML_BOX)
AtkObject*
gail_html_box_block_new (GObject *obj)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_ref (GAIL_TYPE_HTML_BOX);
-
class->get_n_children = gail_html_box_block_get_n_children;
class->ref_child = gail_html_box_block_ref_child;
}
static AtkObject* gail_html_box_embedded_ref_child (AtkObject *obj,
gint i);
-static GailHtmlBoxClass *parent_class = NULL;
-
-GType
-gail_html_box_embedded_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailHtmlBoxEmbeddedClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_html_box_embedded_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailHtmlBoxEmbedded), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_HTML_BOX,
- "GailHtmlBoxEmbedded", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailHtmlBoxEmbedded, gail_html_box_embedded, GAIL_TYPE_HTML_BOX)
AtkObject*
gail_html_box_embedded_new (GObject *obj)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_ref (GAIL_TYPE_HTML_BOX);
-
class->get_n_children = gail_html_box_embedded_get_n_children;
class->ref_child = gail_html_box_embedded_ref_child;
}
gint *start_offset,
gint *end_offset);
-static AtkObjectClass *parent_class = NULL;
-
-GType
-gail_html_box_text_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailHtmlBoxTextClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_html_box_text_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailHtmlBoxText), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) gail_html_box_text_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
- type = g_type_register_static (GAIL_TYPE_HTML_BOX,
- "GailHtmlBoxText", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailHtmlBoxText, gail_html_box_text, GAIL_TYPE_HTML_BOX,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, gail_html_box_text_text_interface_init))
AtkObject*
gail_html_box_text_new (GObject *obj)
static void
gail_html_box_text_class_init (GailHtmlBoxTextClass *klass)
{
- parent_class = g_type_class_ref (ATK_TYPE_OBJECT);
}
static void
gail_html_box_text_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_text = gail_html_box_text_get_text;
iface->get_text_after_offset = gail_html_box_text_get_text_after_offset;
iface->get_text_at_offset = gail_html_box_text_get_text_at_offset;
GtkStockItem stock_item;
const gchar *name;
- name = ATK_OBJECT_CLASS (gail_image_parent_class)->get_name (accessible);
+ name = ATK_OBJECT_CLASS (gail_image_parent_class)->get_name (accessible);
if (name)
return name;
#include "gailimagecell.h"
static void gail_image_cell_class_init (GailImageCellClass *klass);
-static void gail_image_cell_object_init (GailImageCell *image_cell);
+static void gail_image_cell_init (GailImageCell *image_cell);
static void gail_image_cell_finalize (GObject *object);
static gboolean gail_image_cell_update_cache (GailRendererCell *cell,
gboolean emit_change_signal);
+// FIXMEchpe static!!!
gchar *gail_image_cell_property_list[] = {
"pixbuf",
NULL
};
-static gpointer parent_class = NULL;
-
-GType
-gail_image_cell_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailImageCellClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_image_cell_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailImageCell), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_image_cell_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_image_info =
- {
- (GInterfaceInitFunc) atk_image_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_RENDERER_CELL,
- "GailImageCell", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_IMAGE,
- &atk_image_info);
-
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailImageCell, gail_image_cell, GAIL_TYPE_RENDERER_CELL,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
static void
gail_image_cell_class_init (GailImageCellClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GailRendererCellClass *renderer_cell_class = GAIL_RENDERER_CELL_CLASS(klass);
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class->finalize = gail_image_cell_finalize;
renderer_cell_class->update_cache = gail_image_cell_update_cache;
}
static void
-gail_image_cell_object_init (GailImageCell *image_cell)
+gail_image_cell_init (GailImageCell *image_cell)
{
image_cell->image_description = NULL;
}
GailImageCell *image_cell = GAIL_IMAGE_CELL (object);
g_free (image_cell->image_description);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_image_cell_parent_class)->finalize (object);
}
static gboolean
#include <libgail-util/gailmisc.h>
static void gail_item_class_init (GailItemClass *klass);
+static void gail_item_init (GailItem *item);
static G_CONST_RETURN gchar* gail_item_get_name (AtkObject *obj);
static gint gail_item_get_n_children (AtkObject *obj);
static AtkObject* gail_item_ref_child (AtkObject *obj,
(AtkText *text);
static GtkWidget* get_label_from_container (GtkWidget *container);
-
-
-static GailContainerClass* parent_class = NULL;
-
-GType
-gail_item_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailItemClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_item_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailItem), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailItem", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailItem, gail_item, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void
gail_item_class_init (GailItemClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GailContainerClass *container_class;
- parent_class = g_type_class_peek_parent (klass);
-
container_class = (GailContainerClass *)klass;
gobject_class->finalize = gail_item_finalize;
container_class->remove_gtk = NULL;
}
+static void
+gail_item_init (GailItem *item)
+{
+}
+
AtkObject*
gail_item_new (GtkWidget *widget)
{
GailItem *item = GAIL_ITEM (obj);
GtkWidget *label;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_item_parent_class)->initialize (obj, data);
item->textutil = NULL;
item->text = NULL;
g_free (item->text);
item->text = NULL;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_item_parent_class)->finalize (object);
}
static G_CONST_RETURN gchar*
g_return_val_if_fail (GAIL_IS_ITEM (obj), NULL);
- name = ATK_OBJECT_CLASS (parent_class)->get_name (obj);
+ name = ATK_OBJECT_CLASS (gail_item_parent_class)->get_name (obj);
if (name == NULL)
{
/*
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->get_text = gail_item_get_text;
iface->get_character_at_offset = gail_item_get_character_at_offset;
iface->get_text_before_offset = gail_item_get_text_before_offset;
#include <libgail-util/gailmisc.h>
static void gail_label_class_init (GailLabelClass *klass);
+static void gail_label_init (GailLabel *label);
static void gail_label_real_initialize (AtkObject *obj,
gpointer data);
static void gail_label_real_notify_gtk (GObject *obj,
static AtkAttributeSet* gail_label_get_default_attributes
(AtkText *text);
-static GailWidgetClass *parent_class = NULL;
-
-GType
-gail_label_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailLabelClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_label_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailLabel), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailLabel", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailLabel, gail_label, GAIL_TYPE_WIDGET,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void
gail_label_class_init (GailLabelClass *klass)
widget_class = (GailWidgetClass*)klass;
widget_class->notify_gtk = gail_label_real_notify_gtk;
- parent_class = g_type_class_peek_parent (klass);
-
class->get_name = gail_label_get_name;
class->ref_state_set = gail_label_ref_state_set;
class->ref_relation_set = gail_label_ref_relation_set;
class->initialize = gail_label_real_initialize;
}
+static void
+gail_label_init (GailLabel *label)
+{
+}
+
static void
gail_label_real_initialize (AtkObject *obj,
gpointer data)
GtkWidget *widget;
GailLabel *gail_label;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_label_parent_class)->initialize (obj, data);
gail_label = GAIL_LABEL (obj);
}
else
- parent_class->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_label_parent_class)->notify_gtk (obj, pspec);
}
static void
if (label->textutil)
g_object_unref (label->textutil);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_label_parent_class)->finalize (object);
}
AtkStateSet *state_set;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_label_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
*/
return NULL;
- relation_set = ATK_OBJECT_CLASS (parent_class)->ref_relation_set (obj);
+ relation_set = ATK_OBJECT_CLASS (gail_label_parent_class)->ref_relation_set (obj);
if (!atk_relation_set_contains (relation_set, ATK_RELATION_LABEL_FOR))
{
g_return_val_if_fail (GAIL_IS_LABEL (accessible), NULL);
- name = ATK_OBJECT_CLASS (parent_class)->get_name (accessible);
+ name = ATK_OBJECT_CLASS (gail_label_parent_class)->get_name (accessible);
if (name != NULL)
return name;
else
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->get_text = gail_label_get_text;
iface->get_character_at_offset = gail_label_get_character_at_offset;
iface->get_text_before_offset = gail_label_get_text_before_offset;
static void gail_list_class_init (GailListClass *klass);
+static void gail_list_init (GailList *list);
+
static gint gail_list_get_index_in_parent (AtkObject *accessible);
static void atk_selection_interface_init (AtkSelectionIface *iface);
gint i);
-static GailContainerClass *parent_class = NULL;
-
-GType
-gail_list_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailListClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_list_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailList), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
- static const GInterfaceInfo atk_selection_info =
- {
- (GInterfaceInitFunc) atk_selection_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailList", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_SELECTION,
- &atk_selection_info);
-
-
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailList, gail_list, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
static void
gail_list_class_init (GailListClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->get_index_in_parent = gail_list_get_index_in_parent;
}
+static void
+gail_list_init (GailList *list)
+{
+}
+
AtkObject*
gail_list_new (GtkWidget *widget)
{
if (GAIL_IS_COMBO (accessible->accessible_parent))
return 0;
}
- return ATK_OBJECT_CLASS (parent_class)->get_index_in_parent (accessible);
+ return ATK_OBJECT_CLASS (gail_list_parent_class)->get_index_in_parent (accessible);
}
static void
atk_selection_interface_init (AtkSelectionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->add_selection = gail_list_add_selection;
iface->clear_selection = gail_list_clear_selection;
iface->ref_selection = gail_list_ref_selection;
#include "gailmenu.h"
static void gail_menu_class_init (GailMenuClass *klass);
+static void gail_menu_init (GailMenu *accessible);
static void gail_menu_real_initialize (AtkObject *obj,
gpointer data);
static AtkObject* gail_menu_get_parent (AtkObject *accessible);
static gint gail_menu_get_index_in_parent (AtkObject *accessible);
-static GailMenuShell *parent_class = NULL;
-
-GType
-gail_menu_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailMenuClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_menu_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailMenu), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_MENU_SHELL,
- "GailMenu", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailMenu, gail_menu, GAIL_TYPE_MENU_SHELL)
static void
gail_menu_class_init (GailMenuClass *klass)
class->get_parent = gail_menu_get_parent;
class->get_index_in_parent = gail_menu_get_index_in_parent;
class->initialize = gail_menu_real_initialize;
+}
- parent_class = g_type_class_peek_parent (klass);
+static void
+gail_menu_init (GailMenu *accessible)
+{
}
AtkObject*
gail_menu_real_initialize (AtkObject *obj,
gpointer data)
{
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_menu_parent_class)->initialize (obj, data);
obj->role = ATK_ROLE_MENU;
}
{
return 0;
}
- return ATK_OBJECT_CLASS (parent_class)->get_index_in_parent (accessible);
+ return ATK_OBJECT_CLASS (gail_menu_parent_class)->get_index_in_parent (accessible);
}
#define KEYBINDING_SEPARATOR ";"
static void gail_menu_item_class_init (GailMenuItemClass *klass);
-static void gail_menu_item_object_init (GailMenuItem *menu_item);
+static void gail_menu_item_init (GailMenuItem *menu_item);
static void gail_menu_item_real_initialize
(AtkObject *obj,
GClosure *closure,
gpointer data);
-static gpointer parent_class = NULL;
-
-GType
-gail_menu_item_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailMenuItemClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_menu_item_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailMenuItem), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_menu_item_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_action_info =
- {
- (GInterfaceInitFunc) atk_action_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_ITEM,
- "GailMenuItem", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_ACTION,
- &atk_action_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailMenuItem, gail_menu_item, GAIL_TYPE_ITEM,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
static void
gail_menu_item_class_init (GailMenuItemClass *klass)
class->get_n_children = gail_menu_item_get_n_children;
class->ref_child = gail_menu_item_ref_child;
class->initialize = gail_menu_item_real_initialize;
-
- parent_class = g_type_class_peek_parent (klass);
}
static void
GtkWidget *widget;
GtkWidget *parent;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_menu_item_parent_class)->initialize (obj, data);
g_signal_connect (data,
"select",
}
static void
-gail_menu_item_object_init (GailMenuItem *menu_item)
+gail_menu_item_init (GailMenuItem *menu_item)
{
menu_item->click_keybinding = NULL;
menu_item->click_description = NULL;
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->do_action = gail_menu_item_do_action;
iface->get_n_actions = gail_menu_item_get_n_actions;
iface->get_description = gail_menu_item_get_description;
menu_item->action_idle_handler = 0;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_menu_item_parent_class)->finalize (object);
}
static void
#include "gailmenushell.h"
static void gail_menu_shell_class_init (GailMenuShellClass *klass);
-
+static void gail_menu_shell_init (GailMenuShell *menu_shell);
static void atk_selection_interface_init (AtkSelectionIface *iface);
static gboolean gail_menu_shell_add_selection (AtkSelection *selection,
gint i);
static gboolean gail_menu_shell_remove_selection (AtkSelection *selection,
gint i);
-GType
-gail_menu_shell_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailMenuShellClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_menu_shell_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailMenuShell), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_selection_info =
- {
- (GInterfaceInitFunc) atk_selection_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailMenuShell", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_SELECTION,
- &atk_selection_info);
- }
+G_DEFINE_TYPE_WITH_CODE (GailMenuShell, gail_menu_shell, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
- return type;
+static void
+gail_menu_shell_class_init (GailMenuShellClass *klass)
+{
}
static void
-gail_menu_shell_class_init (GailMenuShellClass *klass)
+gail_menu_shell_init (GailMenuShell *menu_shell)
{
}
static void
atk_selection_interface_init (AtkSelectionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->add_selection = gail_menu_shell_add_selection;
iface->clear_selection = gail_menu_shell_clear_selection;
iface->ref_selection = gail_menu_shell_ref_selection;
#include "gail-private-macros.h"
static void gail_notebook_class_init (GailNotebookClass *klass);
-static void gail_notebook_object_init (GailNotebook *notebook);
+static void gail_notebook_init (GailNotebook *notebook);
static void gail_notebook_finalize (GObject *object);
static void gail_notebook_real_initialize (AtkObject *obj,
gpointer data);
static gboolean gail_notebook_check_focus_tab (gpointer data);
static void gail_notebook_destroyed (gpointer data);
-static gpointer parent_class = NULL;
-GType
-gail_notebook_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailNotebookClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_notebook_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailNotebook), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_notebook_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_selection_info =
- {
- (GInterfaceInitFunc) atk_selection_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailNotebook", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_SELECTION,
- &atk_selection_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailNotebook, gail_notebook, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
static void
gail_notebook_class_init (GailNotebookClass *klass)
widget_class = (GailWidgetClass*)klass;
container_class = (GailContainerClass*)klass;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class->finalize = gail_notebook_finalize;
widget_class->notify_gtk = gail_notebook_real_notify_gtk;
}
static void
-gail_notebook_object_init (GailNotebook *notebook)
+gail_notebook_init (GailNotebook *notebook)
{
notebook->page_cache = NULL;
notebook->selected_page = -1;
GtkNotebook *gtk_notebook;
gint i;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_notebook_parent_class)->initialize (obj, data);
notebook = GAIL_NOTEBOOK (obj);
gtk_notebook = GTK_NOTEBOOK (data);
}
}
else
- GAIL_WIDGET_CLASS (parent_class)->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_notebook_parent_class)->notify_gtk (obj, pspec);
}
static void
if (notebook->idle_focus_id)
g_source_remove (notebook->idle_focus_id);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_notebook_parent_class)->finalize (object);
}
static void
atk_selection_interface_init (AtkSelectionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->add_selection = gail_notebook_add_selection;
iface->ref_selection = gail_notebook_ref_selection;
iface->get_selection_count = gail_notebook_get_selection_count;
#include "gail-private-macros.h"
static void gail_notebook_page_class_init (GailNotebookPageClass *klass);
-
+static void gail_notebook_page_init (GailNotebookPage *page);
static void gail_notebook_page_finalize (GObject *object);
static void gail_notebook_page_label_map_gtk (GtkWidget *widget,
gpointer data);
static GtkWidget* get_label_from_notebook_page (GailNotebookPage *page);
static GtkWidget* find_label_child (GtkContainer *container);
-static gpointer parent_class = NULL;
-
-GType
-gail_notebook_page_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailNotebookPageClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_notebook_page_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailNotebookPage), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_component_info =
- {
- (GInterfaceInitFunc) atk_component_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (ATK_TYPE_OBJECT,
- "GailNotebookPage", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
- &atk_component_info);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- }
- return type;
-}
+/* FIXME: not GAIL_TYPE_OBJECT? */
+G_DEFINE_TYPE_WITH_CODE (GailNotebookPage, gail_notebook_page, ATK_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void
gail_notebook_page_class_init (GailNotebookPageClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->get_name = gail_notebook_page_get_name;
class->get_parent = gail_notebook_page_get_parent;
class->get_n_children = gail_notebook_page_get_n_children;
gobject_class->finalize = gail_notebook_page_finalize;
}
+static void
+gail_notebook_page_init (GailNotebookPage *page)
+{
+}
+
static gint
notify_child_added (gpointer data)
{
if (page->notify_child_added_id)
g_source_remove (page->notify_child_added_id);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_notebook_page_parent_class)->finalize (object);
}
static G_CONST_RETURN gchar*
g_return_val_if_fail (GAIL_NOTEBOOK_PAGE (accessible), NULL);
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_notebook_page_parent_class)->ref_state_set (accessible);
atk_label = _gail_notebook_page_get_tab_label (GAIL_NOTEBOOK_PAGE (accessible));
if (atk_label)
static void
atk_component_interface_init (AtkComponentIface *iface)
{
- g_return_if_fail (iface != NULL);
-
/*
* We use the default implementations for contains, get_position, get_size
*/
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->get_text = gail_notebook_page_get_text;
iface->get_character_at_offset = gail_notebook_page_get_character_at_offset;
iface->get_text_before_offset = gail_notebook_page_get_text_before_offset;
static void gail_object_class_init (GailObjectClass *klass);
+static void gail_object_init (GailObject *object);
+
static void gail_object_real_initialize (AtkObject *obj,
gpointer data);
-static AtkGObjectAccessibleClass *parent_class = NULL;
-
-GType
-gail_object_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailObjectClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_object_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailObject), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (ATK_TYPE_GOBJECT_ACCESSIBLE,
- "GailObject", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailObject, gail_object, ATK_TYPE_GOBJECT_ACCESSIBLE)
AtkObject*
gail_object_new (GObject *obj)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->initialize = gail_object_real_initialize;
}
+static void
+gail_object_init (GailObject *object)
+{
+}
+
static void
gail_object_real_initialize (AtkObject *obj,
gpointer data)
{
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_object_parent_class)->initialize (obj, data);
obj->role = ATK_ROLE_UNKNOWN;
}
#include "gailoptionmenu.h"
static void gail_option_menu_class_init (GailOptionMenuClass *klass);
+static void gail_option_menu_init (GailOptionMenu *menu);
static void gail_option_menu_real_initialize (AtkObject *obj,
gpointer data);
gint i,
const gchar *desc);
-static GailButtonClass* parent_class = NULL;
-
-GType
-gail_option_menu_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailOptionMenuClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_option_menu_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailOptionMenu), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_action_info =
- {
- (GInterfaceInitFunc) atk_action_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_BUTTON,
- "GailOptionMenu", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_ACTION,
- &atk_action_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailOptionMenu, gail_option_menu, GAIL_TYPE_BUTTON,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
static void
gail_option_menu_class_init (GailOptionMenuClass *klass)
container_class->add_gtk = gail_option_menu_real_add_gtk;
container_class->remove_gtk = gail_option_menu_real_remove_gtk;
- parent_class = g_type_class_peek_parent (klass);
+}
+
+static void
+gail_option_menu_init (GailOptionMenu *menu)
+{
}
AtkObject*
gail_option_menu_real_initialize (AtkObject *obj,
gpointer data)
{
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_option_menu_parent_class)->initialize (obj, data);
obj->role = ATK_ROLE_COMBO_BOX;
}
AtkObject* atk_parent = ATK_OBJECT (data);
AtkObject* atk_child = gtk_widget_get_accessible (widget);
- GAIL_CONTAINER_CLASS (parent_class)->add_gtk (container, widget, data);
+ GAIL_CONTAINER_CLASS (gail_option_menu_parent_class)->add_gtk (container, widget, data);
g_object_notify (G_OBJECT (atk_child), "accessible_parent");
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->do_action = gail_option_menu_do_action;
iface->get_n_actions = gail_option_menu_get_n_actions;
iface->get_description = gail_option_menu_get_description;
static void gail_paned_class_init (GailPanedClass *klass);
+static void gail_paned_init (GailPaned *paned);
+
static void gail_paned_real_initialize (AtkObject *obj,
gpointer data);
static void gail_paned_size_allocate_gtk (GtkWidget *widget,
static gboolean gail_paned_set_current_value (AtkValue *obj,
const GValue *value);
-static GailContainerClass *parent_class = NULL;
-
-GType
-gail_paned_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailPanedClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_paned_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailPaned), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_value_info =
- {
- (GInterfaceInitFunc) atk_value_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailPaned", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_VALUE,
- &atk_value_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailPaned, gail_paned, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void
gail_paned_class_init (GailPanedClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_state_set = gail_paned_ref_state_set;
class->initialize = gail_paned_real_initialize;
}
+static void
+gail_paned_init (GailPaned *paned)
+{
+}
+
AtkObject*
gail_paned_new (GtkWidget *widget)
{
AtkStateSet *state_set;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_paned_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
gail_paned_real_initialize (AtkObject *obj,
gpointer data)
{
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_paned_parent_class)->initialize (obj, data);
g_signal_connect (data,
"size_allocate",
static void
atk_value_interface_init (AtkValueIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_current_value = gail_paned_get_current_value;
iface->get_maximum_value = gail_paned_get_maximum_value;
iface->get_minimum_value = gail_paned_get_minimum_value;
iface->set_current_value = gail_paned_set_current_value;
-
}
static void
#include "gailpixmap.h"
static void gail_pixmap_class_init (GailPixmapClass *klass);
-static void gail_pixmap_object_init (GailPixmap *pixmap);
+static void gail_pixmap_init (GailPixmap *pixmap);
/* AtkImage */
static void atk_image_interface_init (AtkImageIface *iface);
const gchar *description);
static void gail_pixmap_finalize (GObject *object);
-static GailWidgetClass* parent_class = NULL;
-
-GType
-gail_pixmap_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailPixmapClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_pixmap_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailPixmap), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_pixmap_object_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_image_info =
- {
- (GInterfaceInitFunc) atk_image_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailPixmap", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_IMAGE,
- &atk_image_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailPixmap, gail_pixmap, GAIL_TYPE_WIDGET,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
static void
gail_pixmap_class_init (GailPixmapClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gail_pixmap_finalize;
-
- parent_class = g_type_class_peek_parent (klass);
}
static void
-gail_pixmap_object_init (GailPixmap *pixmap)
+gail_pixmap_init (GailPixmap *pixmap)
{
pixmap->image_description = NULL;
}
static void
atk_image_interface_init (AtkImageIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_image_description = gail_pixmap_get_image_description;
iface->get_image_position = gail_pixmap_get_image_position;
iface->get_image_size = gail_pixmap_get_image_size;
GailPixmap *pixmap = GAIL_PIXMAP (object);
g_free (pixmap->image_description);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_pixmap_parent_class)->finalize (object);
}
#include "gailadjustment.h"
static void gail_progress_bar_class_init (GailProgressBarClass *klass);
+static void gail_progress_bar_init (GailProgressBar *bar);
static void gail_progress_bar_real_initialize (AtkObject *obj,
gpointer data);
static void gail_progress_bar_finalize (GObject *object);
static void gail_progress_bar_value_changed (GtkAdjustment *adjustment,
gpointer data);
-static GailWidgetClass *parent_class = NULL;
-
-GType
-gail_progress_bar_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailProgressBarClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_progress_bar_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailProgressBar), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_value_info =
- {
- (GInterfaceInitFunc) atk_value_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailProgressBar", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_VALUE,
- &atk_value_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailProgressBar, gail_progress_bar, GAIL_TYPE_WIDGET,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void
gail_progress_bar_class_init (GailProgressBarClass *klass)
class->initialize = gail_progress_bar_real_initialize;
gobject_class->finalize = gail_progress_bar_finalize;
+}
- parent_class = g_type_class_peek_parent (klass);
+static void
+gail_progress_bar_init (GailProgressBar *bar)
+{
}
AtkObject*
GailProgressBar *progress_bar = GAIL_PROGRESS_BAR (obj);
GtkProgress *gtk_progress;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_progress_bar_parent_class)->initialize (obj, data);
gtk_progress = GTK_PROGRESS (data);
/*
static void
atk_value_interface_init (AtkValueIface *iface)
{
-
- g_return_if_fail (iface != NULL);
-
iface->get_current_value = gail_progress_bar_get_current_value;
iface->get_maximum_value = gail_progress_bar_get_maximum_value;
iface->get_minimum_value = gail_progress_bar_get_minimum_value;
progress_bar->adjustment = NULL;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_progress_bar_parent_class)->finalize (object);
}
progress_bar);
}
else
- parent_class->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_progress_bar_parent_class)->notify_gtk (obj, pspec);
}
static void
#include "gailradiobutton.h"
static void gail_radio_button_class_init (GailRadioButtonClass *klass);
-static void gail_radio_button_instance_init (GailRadioButton *radio_button);
+static void gail_radio_button_init (GailRadioButton *radio_button);
-static AtkRelationSet* gail_radio_button_ref_relation_set (AtkObject *obj)
-;
+static AtkRelationSet* gail_radio_button_ref_relation_set (AtkObject *obj);
-static GailToggleButtonClass *parent_class = NULL;
-
-GType
-gail_radio_button_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailRadioButtonClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_radio_button_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailRadioButton), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_radio_button_instance_init, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_TOGGLE_BUTTON,
- "GailRadioButton", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailRadioButton, gail_radio_button, GAIL_TYPE_TOGGLE_BUTTON)
static void
gail_radio_button_class_init (GailRadioButtonClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_relation_set = gail_radio_button_ref_relation_set;
}
}
static void
-gail_radio_button_instance_init (GailRadioButton *radio_button)
+gail_radio_button_init (GailRadioButton *radio_button)
{
radio_button->old_group = NULL;
}
}
radio_button = GAIL_RADIO_BUTTON (obj);
- relation_set = ATK_OBJECT_CLASS (parent_class)->ref_relation_set (obj);
+ relation_set = ATK_OBJECT_CLASS (gail_radio_button_parent_class)->ref_relation_set (obj);
/*
* If the radio button'group has changed remove the relation
#include "gailradiosubmenuitem.h"
static void gail_radio_menu_item_class_init (GailRadioMenuItemClass *klass);
-static void gail_radio_menu_item_instance_init (GailRadioMenuItem *radio_menu_item);
+static void gail_radio_menu_item_init (GailRadioMenuItem *radio_menu_item);
-static AtkRelationSet* gail_radio_menu_item_ref_relation_set (AtkObject *obj)
-;
+static AtkRelationSet* gail_radio_menu_item_ref_relation_set (AtkObject *obj);
-static GailCheckMenuItemClass *parent_class = NULL;
-
-GType
-gail_radio_menu_item_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailRadioMenuItemClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_radio_menu_item_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailRadioMenuItem), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_radio_menu_item_instance_init, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_CHECK_MENU_ITEM,
- "GailRadioMenuItem", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailRadioMenuItem, gail_radio_menu_item, GAIL_TYPE_CHECK_MENU_ITEM)
static void
gail_radio_menu_item_class_init (GailRadioMenuItemClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_relation_set = gail_radio_menu_item_ref_relation_set;
}
}
static void
-gail_radio_menu_item_instance_init (GailRadioMenuItem *radio_menu_item)
+gail_radio_menu_item_init (GailRadioMenuItem *radio_menu_item)
{
radio_menu_item->old_group = NULL;
}
}
radio_menu_item = GAIL_RADIO_MENU_ITEM (obj);
- relation_set = ATK_OBJECT_CLASS (parent_class)->ref_relation_set (obj);
+ relation_set = ATK_OBJECT_CLASS (gail_radio_menu_item_parent_class)->ref_relation_set (obj);
/*
* If the radio menu_item'group has changed remove the relation
#include "gailradiosubmenuitem.h"
static void gail_radio_sub_menu_item_class_init (GailRadioSubMenuItemClass *klass);
-static void gail_radio_sub_menu_item_instance_init (GailRadioSubMenuItem *radio_menu_item);
+static void gail_radio_sub_menu_item_init (GailRadioSubMenuItem *radio_menu_item);
-static AtkRelationSet* gail_radio_sub_menu_item_ref_relation_set (AtkObject *obj)
-;
+static AtkRelationSet* gail_radio_sub_menu_item_ref_relation_set (AtkObject *obj);
-static GailCheckSubMenuItemClass *parent_class = NULL;
-
-GType
-gail_radio_sub_menu_item_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailRadioSubMenuItemClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_radio_sub_menu_item_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailRadioSubMenuItem), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_radio_sub_menu_item_instance_init, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_CHECK_SUB_MENU_ITEM,
- "GailRadioSubMenuItem", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailRadioSubMenuItem, gail_radio_sub_menu_item, GAIL_TYPE_CHECK_SUB_MENU_ITEM)
static void
gail_radio_sub_menu_item_class_init (GailRadioSubMenuItemClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_relation_set = gail_radio_sub_menu_item_ref_relation_set;
}
}
static void
-gail_radio_sub_menu_item_instance_init (GailRadioSubMenuItem *radio_menu_item)
+gail_radio_sub_menu_item_init (GailRadioSubMenuItem *radio_menu_item)
{
radio_menu_item->old_group = NULL;
}
}
radio_menu_item = GAIL_RADIO_SUB_MENU_ITEM (obj);
- relation_set = ATK_OBJECT_CLASS (parent_class)->ref_relation_set (obj);
+ relation_set = ATK_OBJECT_CLASS (gail_radio_sub_menu_item_parent_class)->ref_relation_set (obj);
/*
* If the radio menu_item'group has changed remove the relation
static void gail_range_class_init (GailRangeClass *klass);
+static void gail_range_init (GailRange *range);
+
static void gail_range_real_initialize (AtkObject *obj,
gpointer data);
static gboolean gail_range_set_description (AtkAction *action,
gint i,
const gchar *desc);
-static GailWidgetClass *parent_class = NULL;
-
-GType
-gail_range_get_type (void)
-{
- static GType type = 0;
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailRangeClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_range_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailRange), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_action_info =
- {
- (GInterfaceInitFunc) atk_action_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
-
- static const GInterfaceInfo atk_value_info =
- {
- (GInterfaceInitFunc) atk_value_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailRange", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_ACTION,
- &atk_action_info);
-
- g_type_add_interface_static (type, ATK_TYPE_VALUE,
- &atk_value_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailRange, gail_range, GAIL_TYPE_WIDGET,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void
gail_range_class_init (GailRangeClass *klass)
class->initialize = gail_range_real_initialize;
gobject_class->finalize = gail_range_finalize;
+}
- parent_class = g_type_class_peek_parent (klass);
+static void
+gail_range_init (GailRange *range)
+{
}
AtkObject*
GailRange *range = GAIL_RANGE (obj);
GtkRange *gtk_range;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_range_parent_class)->initialize (obj, data);
gtk_range = GTK_RANGE (data);
/*
GtkWidget *widget;
GtkRange *range;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
+ state_set = ATK_OBJECT_CLASS (gail_range_parent_class)->ref_state_set (obj);
widget = GTK_ACCESSIBLE (obj)->widget;
if (widget == NULL)
static void
atk_value_interface_init (AtkValueIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_current_value = gail_range_get_current_value;
iface->get_maximum_value = gail_range_get_maximum_value;
iface->get_minimum_value = gail_range_get_minimum_value;
iface->set_current_value = gail_range_set_current_value;
-
}
static void
range->action_idle_handler = 0;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_range_parent_class)->finalize (object);
}
range);
}
else
- parent_class->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_range_parent_class)->notify_gtk (obj, pspec);
}
static void
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->do_action = gail_range_do_action;
iface->get_n_actions = gail_range_get_n_actions;
iface->get_description = gail_range_get_description;
#include "gailrenderercell.h"
static void gail_renderer_cell_class_init (GailRendererCellClass *klass);
-static void gail_renderer_cell_object_init (GailRendererCell *renderer_cell);
+static void gail_renderer_cell_init (GailRendererCell *renderer_cell);
-static void gail_renderer_cell_finalize (GObject *object)
-;
-static gpointer parent_class = NULL;
+static void gail_renderer_cell_finalize (GObject *object);
-GType
-gail_renderer_cell_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailRendererCellClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_renderer_cell_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailRendererCell), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_renderer_cell_object_init, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_CELL,
- "GailRendererCell", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailRendererCell, gail_renderer_cell, GAIL_TYPE_CELL)
static void
gail_renderer_cell_class_init (GailRendererCellClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
klass->property_list = NULL;
gobject_class->finalize = gail_renderer_cell_finalize;
}
static void
-gail_renderer_cell_object_init (GailRendererCell *renderer_cell)
+gail_renderer_cell_init (GailRendererCell *renderer_cell)
{
renderer_cell->renderer = NULL;
}
if (renderer_cell->renderer)
g_object_unref (renderer_cell->renderer);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_renderer_cell_parent_class)->finalize (object);
}
gboolean
static void gail_scale_class_init (GailScaleClass *klass);
+static void gail_scale_init (GailScale *scale);
+
static void gail_scale_real_initialize (AtkObject *obj,
gpointer data);
static void gail_scale_notify (GObject *obj,
static AtkAttributeSet* gail_scale_get_default_attributes
(AtkText *text);
-static gpointer parent_class = NULL;
-
-GType
-gail_scale_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailRangeClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_scale_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailScale), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_RANGE,
- "GailScale", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailScale, gail_scale, GAIL_TYPE_RANGE,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void
gail_scale_class_init (GailScaleClass *klass)
gobject_class->finalize = gail_scale_finalize;
gobject_class->notify = gail_scale_notify;
-
- parent_class = g_type_class_peek_parent (klass);
}
AtkObject*
return accessible;
}
+static void
+gail_scale_init (GailScale *scale)
+{
+}
+
static void
gail_scale_real_initialize (AtkObject *obj,
gpointer data)
const gchar *txt;
PangoLayout *layout;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_scale_parent_class)->initialize (obj, data);
gail_scale = GAIL_SCALE (obj);
gail_scale->textutil = gail_text_util_new ();
GailScale *scale = GAIL_SCALE (object);
g_object_unref (scale->textutil);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_scale_parent_class)->finalize (object);
}
}
}
}
- G_OBJECT_CLASS (parent_class)->notify (obj, pspec);
+ G_OBJECT_CLASS (gail_scale_parent_class)->notify (obj, pspec);
}
/* atktext.h */
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->get_text = gail_scale_get_text;
iface->get_character_at_offset = gail_scale_get_character_at_offset;
iface->get_text_before_offset = gail_scale_get_text_before_offset;
#include <gtk/gtk.h>
#include "gailscrollbar.h"
-static void gail_scrollbar_class_init (GailScrollbarClass *klass);
+static void gail_scrollbar_class_init (GailScrollbarClass *klass);
+static void gail_scrollbar_init (GailScrollbar *accessible);
-static gint gail_scrollbar_get_index_in_parent (AtkObject *accessible);
+static gint gail_scrollbar_get_index_in_parent (AtkObject *accessible);
-static GailRangeClass *parent_class = NULL;
-
-GType
-gail_scrollbar_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailScrollbarClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_scrollbar_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailScrollbar), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_RANGE,
- "GailScrollbar", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailScrollbar, gail_scrollbar, GAIL_TYPE_RANGE)
static void
gail_scrollbar_class_init (GailScrollbarClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
class->get_index_in_parent = gail_scrollbar_get_index_in_parent;
+}
- parent_class = g_type_class_peek_parent (klass);
+static void
+gail_scrollbar_init (GailScrollbar *accessible)
+{
}
AtkObject*
g_return_val_if_fail (GTK_IS_SCROLLBAR (widget), -1);
if (!GTK_IS_SCROLLED_WINDOW(widget->parent))
- return ATK_OBJECT_CLASS (parent_class)->get_index_in_parent (accessible);
+ return ATK_OBJECT_CLASS (gail_scrollbar_parent_class)->get_index_in_parent (accessible);
scrolled_window = GTK_SCROLLED_WINDOW (widget->parent);
children = gtk_container_get_children (GTK_CONTAINER (scrolled_window));
static void gail_scrolled_window_class_init (GailScrolledWindowClass *klass);
+static void gail_scrolled_window_init (GailScrolledWindow *window);
static void gail_scrolled_window_real_initialize
(AtkObject *obj,
gpointer data);
GParamSpec *pspec,
gpointer user_data);
-static GailContainerClass *parent_class = NULL;
-
-GType
-gail_scrolled_window_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailScrolledWindowClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_scrolled_window_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailScrolledWindow), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailScrolledWindow", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailScrolledWindow, gail_scrolled_window, GAIL_TYPE_CONTAINER)
static void
gail_scrolled_window_class_init (GailScrolledWindowClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->get_n_children = gail_scrolled_window_get_n_children;
class->ref_child = gail_scrolled_window_ref_child;
class->initialize = gail_scrolled_window_real_initialize;
}
+static void
+gail_scrolled_window_init (GailScrolledWindow *window)
+{
+}
+
AtkObject*
gail_scrolled_window_new (GtkWidget *widget)
{
{
GtkScrolledWindow *window;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_scrolled_window_parent_class)->initialize (obj, data);
window = GTK_SCROLLED_WINDOW (data);
g_signal_connect_data (window->hscrollbar, "notify::visible",
#include <gtk/gtk.h>
#include "gailseparator.h"
-static void gail_separator_class_init (GailSeparatorClass *klass);
+static void gail_separator_class_init (GailSeparatorClass *klass);
+static void gail_separator_init (GailSeparator *accessible);
static AtkStateSet* gail_separator_ref_state_set (AtkObject *accessible);
-static GailWidgetClass *parent_class = NULL;
-
-GType
-gail_separator_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailSeparatorClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_separator_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailSeparator), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_WIDGET,
- "GailSeparator", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailSeparator, gail_separator, GAIL_TYPE_WIDGET)
static void
gail_separator_class_init (GailSeparatorClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_state_set = gail_separator_ref_state_set;
}
+static void
+gail_separator_init (GailSeparator *accessible)
+{
+}
+
AtkObject*
gail_separator_new (GtkWidget *widget)
{
AtkStateSet *state_set;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_separator_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
#include "gail-private-macros.h"
static void gail_spin_button_class_init (GailSpinButtonClass *klass);
+static void gail_spin_button_init (GailSpinButton *button);
static void gail_spin_button_real_initialize (AtkObject *obj,
gpointer data);
static void gail_spin_button_finalize (GObject *object);
const GValue *value);
static void gail_spin_button_value_changed (GtkAdjustment *adjustment,
gpointer data);
-
-static GailWidgetClass *parent_class = NULL;
-
-GType
-gail_spin_button_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailSpinButtonClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_spin_button_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailSpinButton), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_value_info =
- {
- (GInterfaceInitFunc) atk_value_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_ENTRY,
- "GailSpinButton", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_VALUE,
- &atk_value_info);
- }
-
- return type;
-}
+
+G_DEFINE_TYPE_WITH_CODE (GailSpinButton, gail_spin_button, GAIL_TYPE_ENTRY,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void
gail_spin_button_class_init (GailSpinButtonClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GailWidgetClass *widget_class;
- parent_class = g_type_class_peek_parent (klass);
-
widget_class = (GailWidgetClass*)klass;
widget_class->notify_gtk = gail_spin_button_real_notify_gtk;
gobject_class->finalize = gail_spin_button_finalize;
}
+static void
+gail_spin_button_init (GailSpinButton *button)
+{
+}
+
AtkObject*
gail_spin_button_new (GtkWidget *widget)
{
GailSpinButton *spin_button = GAIL_SPIN_BUTTON (obj);
GtkSpinButton *gtk_spin_button;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_spin_button_parent_class)->initialize (obj, data);
gtk_spin_button = GTK_SPIN_BUTTON (data);
/*
static void
atk_value_interface_init (AtkValueIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_current_value = gail_spin_button_get_current_value;
iface->get_maximum_value = gail_spin_button_get_maximum_value;
iface->get_minimum_value = gail_spin_button_get_minimum_value;
g_object_unref (spin_button->adjustment);
spin_button->adjustment = NULL;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_spin_button_parent_class)->finalize (object);
}
spin_button);
}
else
- parent_class->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_spin_button_parent_class)->notify_gtk (obj, pspec);
}
#include <libgail-util/gailmisc.h>
static void gail_statusbar_class_init (GailStatusbarClass *klass);
+static void gail_statusbar_init (GailStatusbar *bar);
static G_CONST_RETURN gchar* gail_statusbar_get_name (AtkObject *obj);
static gint gail_statusbar_get_n_children (AtkObject *obj);
static AtkObject* gail_statusbar_ref_child (AtkObject *obj,
(AtkText *text);
static GtkWidget* get_label_from_statusbar (GtkWidget *statusbar);
-static GailContainerClass* parent_class = NULL;
-
-GType
-gail_statusbar_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailStatusbarClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_statusbar_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailStatusbar), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailStatusbar", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailStatusbar, gail_statusbar, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void
gail_statusbar_class_init (GailStatusbarClass *klass)
container_class = (GailContainerClass*)klass;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class->finalize = gail_statusbar_finalize;
class->get_name = gail_statusbar_get_name;
container_class->remove_gtk = NULL;
}
+static void
+gail_statusbar_init (GailStatusbar *bar)
+{
+}
+
AtkObject*
gail_statusbar_new (GtkWidget *widget)
{
g_return_val_if_fail (GAIL_IS_STATUSBAR (obj), NULL);
- name = ATK_OBJECT_CLASS (parent_class)->get_name (obj);
+ name = ATK_OBJECT_CLASS (gail_statusbar_parent_class)->get_name (obj);
if (name != NULL)
return name;
else
GailStatusbar *statusbar = GAIL_STATUSBAR (obj);
GtkWidget *label;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_statusbar_parent_class)->initialize (obj, data);
/*
* We get notified of changes to the label
{
g_object_unref (statusbar->textutil);
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_statusbar_parent_class)->finalize (object);
}
/* atktext.h */
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->get_text = gail_statusbar_get_text;
iface->get_character_at_offset = gail_statusbar_get_character_at_offset;
iface->get_text_before_offset = gail_statusbar_get_text_before_offset;
#include "gailsubmenuitem.h"
static void gail_sub_menu_item_class_init (GailSubMenuItemClass *klass);
+static void gail_sub_menu_item_init (GailSubMenuItem *item);
static void gail_sub_menu_item_real_initialize (AtkObject *obj,
gpointer data);
static gint menu_item_remove_gtk (GtkContainer *container,
GtkWidget *widget);
-static gpointer parent_class = NULL;
-
-GType
-gail_sub_menu_item_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailSubMenuItemClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_sub_menu_item_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailSubMenuItem), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_selection_info =
- {
- (GInterfaceInitFunc) atk_selection_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_MENU_ITEM,
- "GailSubMenuItem", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_SELECTION,
- &atk_selection_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailSubMenuItem, gail_sub_menu_item, GAIL_TYPE_MENU_ITEM,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
static void
gail_sub_menu_item_class_init (GailSubMenuItemClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
class->initialize = gail_sub_menu_item_real_initialize;
+}
- parent_class = g_type_class_peek_parent (klass);
+static void
+gail_sub_menu_item_init (GailSubMenuItem *item)
+{
}
static void
{
GtkWidget *submenu;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_sub_menu_item_parent_class)->initialize (obj, data);
submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (data));
g_return_if_fail (submenu);
static void
atk_selection_interface_init (AtkSelectionIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->add_selection = gail_sub_menu_item_add_selection;
iface->clear_selection = gail_sub_menu_item_clear_selection;
iface->ref_selection = gail_sub_menu_item_ref_selection;
NULL
};
-static gpointer parent_class = NULL;
-
-GType
-gail_text_cell_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailTextCellClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_text_cell_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailTextCell), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_text_cell_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_RENDERER_CELL,
- "GailTextCell", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- gail_cell_type_add_action_interface (type);
- }
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailTextCell, gail_text_cell, GAIL_TYPE_RENDERER_CELL,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init))
static void
gail_text_cell_class_init (GailTextCellClass *klass)
AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
GailRendererCellClass *renderer_cell_class = GAIL_RENDERER_CELL_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
renderer_cell_class->update_cache = gail_text_cell_update_cache;
renderer_cell_class->property_list = gail_text_cell_property_list;
g_object_unref (text_cell->textutil);
g_free (text_cell->cell_text);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_text_cell_parent_class)->finalize (object);
}
static G_CONST_RETURN gchar*
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->get_text = gail_text_cell_get_text;
iface->get_character_at_offset = gail_text_cell_get_character_at_offset;
iface->get_text_before_offset = gail_text_cell_get_text_before_offset;
gint insert_offset);
static gint insert_idle_handler (gpointer data);
-static GailWidgetClass *parent_class = NULL;
-
typedef struct _GailTextViewPaste GailTextViewPaste;
struct _GailTextViewPaste
gint position;
};
-GType
-gail_text_view_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailTextViewClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_text_view_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailTextView), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_text_view_init, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_editable_text_info =
- {
- (GInterfaceInitFunc) atk_editable_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_text_info =
- {
- (GInterfaceInitFunc) atk_text_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_streamable_content_info =
- {
- (GInterfaceInitFunc) atk_streamable_content_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailTextView", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT,
- &atk_editable_text_info);
- g_type_add_interface_static (type, ATK_TYPE_TEXT,
- &atk_text_info);
- g_type_add_interface_static (type, ATK_TYPE_STREAMABLE_CONTENT,
- &atk_streamable_content_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailTextView, gail_text_view, GAIL_TYPE_CONTAINER,
+ 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))
static void
gail_text_view_class_init (GailTextViewClass *klass)
widget_class = (GailWidgetClass*)klass;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class->finalize = gail_text_view_finalize;
class->ref_state_set = gail_text_view_ref_state_set;
GtkTextView *view;
GailTextView *gail_view;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_text_view_parent_class)->initialize (obj, data);
view = GTK_TEXT_VIEW (data);
if (text_view->insert_notify_handler)
g_source_remove (text_view->insert_notify_handler);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_text_view_parent_class)->finalize (object);
}
AtkObject*
setup_buffer (GTK_TEXT_VIEW (obj), GAIL_TEXT_VIEW (atk_obj));
}
else
- parent_class->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_text_view_parent_class)->notify_gtk (obj, pspec);
}
/* atkobject.h */
GtkTextView *text_view;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_text_view_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_text = gail_text_view_get_text;
iface->get_text_after_offset = gail_text_view_get_text_after_offset;
iface->get_text_at_offset = gail_text_view_get_text_at_offset;
static void
atk_editable_text_interface_init (AtkEditableTextIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->set_text_contents = gail_text_view_set_text_contents;
iface->insert_text = gail_text_view_insert_text;
iface->copy_text = gail_text_view_copy_text;
static void
atk_streamable_content_interface_init (AtkStreamableContentIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->get_n_mime_types = gail_streamable_content_get_n_mime_types;
iface->get_mime_type = gail_streamable_content_get_mime_type;
iface->get_stream = gail_streamable_content_get_stream;
static void gail_toggle_button_class_init (GailToggleButtonClass *klass);
+static void gail_toggle_button_init (GailToggleButton *button);
+
static void gail_toggle_button_toggled_gtk (GtkWidget *widget);
static void gail_toggle_button_real_notify_gtk (GObject *obj,
static AtkStateSet* gail_toggle_button_ref_state_set (AtkObject *accessible);
-static GailButtonClass *parent_class = NULL;
-
-GType
-gail_toggle_button_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailToggleButtonClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_toggle_button_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailToggleButton), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (GAIL_TYPE_BUTTON,
- "GailToggleButton", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailToggleButton, gail_toggle_button, GAIL_TYPE_BUTTON)
static void
gail_toggle_button_class_init (GailToggleButtonClass *klass)
widget_class = (GailWidgetClass*)klass;
widget_class->notify_gtk = gail_toggle_button_real_notify_gtk;
- parent_class = g_type_class_peek_parent (klass);
-
class->ref_state_set = gail_toggle_button_ref_state_set;
class->initialize = gail_toggle_button_real_initialize;
}
+static void
+gail_toggle_button_init (GailToggleButton *button)
+{
+}
+
AtkObject*
gail_toggle_button_new (GtkWidget *widget)
{
gail_toggle_button_real_initialize (AtkObject *obj,
gpointer data)
{
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_toggle_button_parent_class)->initialize (obj, data);
g_signal_connect (data,
"toggled",
GtkToggleButton *toggle_button;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_toggle_button_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED,
!gtk_toggle_button_get_inconsistent (toggle_button));
else
- GAIL_WIDGET_CLASS (parent_class)->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_toggle_button_parent_class)->notify_gtk (obj, pspec);
}
#include "gailtoplevel.h"
static void gail_toplevel_class_init (GailToplevelClass *klass);
-static void gail_toplevel_object_init (GailToplevel *toplevel);
+static void gail_toplevel_init (GailToplevel *toplevel);
static void gail_toplevel_object_finalize (GObject *obj);
/* atkobject.h */
static gboolean is_combo_window (GtkWidget *widget);
-static gpointer parent_class = NULL;
-
-GType
-gail_toplevel_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailToplevelClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_toplevel_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailToplevel), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) gail_toplevel_object_init, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (ATK_TYPE_OBJECT,
- "GailToplevel", &tinfo, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE (GailToplevel, gail_toplevel, ATK_TYPE_OBJECT)
AtkObject*
gail_toplevel_new (void)
AtkObjectClass *class = ATK_OBJECT_CLASS(klass);
GObjectClass *g_object_class = G_OBJECT_CLASS(klass);
- parent_class = g_type_class_peek_parent (klass);
-
class->get_n_children = gail_toplevel_get_n_children;
class->ref_child = gail_toplevel_ref_child;
class->get_parent = gail_toplevel_get_parent;
}
static void
-gail_toplevel_object_init (GailToplevel *toplevel)
+gail_toplevel_init (GailToplevel *toplevel)
{
GtkWindow *window;
GtkWidget *widget;
if (toplevel->window_list)
g_list_free (toplevel->window_list);
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (gail_toplevel_parent_class)->finalize (obj);
}
static AtkObject*
typedef struct _GailTreeViewCellInfo GailTreeViewCellInfo;
static void gail_tree_view_class_init (GailTreeViewClass *klass);
+static void gail_tree_view_init (GailTreeView *view);
static void gail_tree_view_real_initialize (AtkObject *obj,
gpointer data);
static void gail_tree_view_real_notify_gtk (GObject *obj,
static gboolean idle_garbage_collect_cell_data (gpointer data);
static gboolean garbage_collect_cell_data (gpointer data);
-static GailWidgetClass *parent_class = NULL;
static GQuark quark_column_desc_object = 0;
static GQuark quark_column_header_object = 0;
static gboolean editing = FALSE;
gboolean in_use;
};
-GType
-gail_tree_view_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailTreeViewClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_tree_view_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailTreeView), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_table_info =
- {
- (GInterfaceInitFunc) atk_table_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_selection_info =
- {
- (GInterfaceInitFunc) atk_selection_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo atk_component_info =
- {
- (GInterfaceInitFunc) atk_component_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- static const GInterfaceInfo gail_cell_parent_info =
- {
- (GInterfaceInitFunc) gail_cell_parent_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailTreeView", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_TABLE,
- &atk_table_info);
- g_type_add_interface_static (type, ATK_TYPE_SELECTION,
- &atk_selection_info);
- g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
- &atk_component_info);
- g_type_add_interface_static (type, GAIL_TYPE_CELL_PARENT,
- &gail_cell_parent_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailTreeView, gail_tree_view, GAIL_TYPE_CONTAINER,
+ 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)
+ G_IMPLEMENT_INTERFACE (GAIL_TYPE_CELL_PARENT, gail_cell_parent_interface_init))
static void
gail_tree_view_class_init (GailTreeViewClass *klass)
widget_class = (GailWidgetClass*)klass;
container_class = (GailContainerClass*)klass;
- parent_class = g_type_class_peek_parent (klass);
-
class->get_n_children = gail_tree_view_get_n_children;
class->ref_child = gail_tree_view_ref_child;
class->ref_state_set = gail_tree_view_ref_state_set;
quark_column_header_object = g_quark_from_static_string ("gtk-header-object");
}
+static void
+gail_tree_view_init (GailTreeView *view)
+{
+}
+
static void
gail_tree_view_real_initialize (AtkObject *obj,
gpointer data)
GList *tv_cols, *tmp_list;
GtkWidget *widget;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_tree_view_parent_class)->initialize (obj, data);
view = GAIL_TREE_VIEW (obj);
view->caption = NULL;
tree_view);
}
else
- parent_class->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_tree_view_parent_class)->notify_gtk (obj, pspec);
}
AtkObject*
g_array_free (array, TRUE);
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_tree_view_parent_class)->finalize (object);
}
static void
G_CALLBACK (gail_tree_view_destroyed),
accessible);
}
- GTK_ACCESSIBLE_CLASS (parent_class)->connect_widget_destroyed (accessible);
+ GTK_ACCESSIBLE_CLASS (gail_tree_view_parent_class)->connect_widget_destroyed (accessible);
}
static void
gail_return_val_if_fail (container, NULL);
container_cell = GAIL_CELL (container);
- gail_cell_init (container_cell,
- widget, ATK_OBJECT (gailview),
- i);
+ gail_cell_initialise (container_cell,
+ widget, ATK_OBJECT (gailview),
+ i);
/*
* The GailTreeViewCellInfo structure for the container will be before
* the ones for the cells so that the first one we find for a position
/* Create the GailTreeViewCellInfo structure for this cell */
cell_info_new (gailview, tree_model, path, tv_col, cell);
- gail_cell_init (cell,
- widget, parent,
- i);
+ gail_cell_initialise (cell,
+ widget, parent,
+ i);
cell->refresh_index = refresh_cell_index;
/* Create the GailTreeViewCellInfo structure for this cell */
cell_info_new (gailview, tree_model, path, tv_col, cell);
- gail_cell_init (cell,
- widget, parent,
- i);
+ gail_cell_initialise (cell,
+ widget, parent,
+ i);
if (container)
gail_container_cell_add_child (container, cell);
AtkStateSet *state_set;
GtkWidget *widget;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
+ state_set = ATK_OBJECT_CLASS (gail_tree_view_parent_class)->ref_state_set (obj);
widget = GTK_ACCESSIBLE (obj)->widget;
if (widget != NULL)
static void
atk_component_interface_init (AtkComponentIface *iface)
{
- g_return_if_fail (iface != NULL);
-
iface->ref_accessible_at_point = gail_tree_view_ref_accessible_at_point;
}
static void
atk_table_interface_init (AtkTableIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->ref_at = gail_tree_view_table_ref_at;
iface->get_n_rows = gail_tree_view_get_n_rows;
iface->get_n_columns = gail_tree_view_get_n_columns;
static void atk_selection_interface_init (AtkSelectionIface *iface)
{
- g_return_if_fail (iface != NULL);
iface->add_selection = gail_tree_view_add_selection;
iface->clear_selection = gail_tree_view_clear_selection;
iface->ref_selection = gail_tree_view_ref_selection;
static void gail_cell_parent_interface_init (GailCellParentIface *iface)
{
- g_return_if_fail (iface);
-
iface->get_cell_extents = gail_tree_view_get_cell_extents;
iface->get_cell_area = gail_tree_view_get_cell_area;
iface->grab_focus = gail_tree_view_grab_cell_focus;
#include "gail-private-macros.h"
static void gail_util_class_init (GailUtilClass *klass);
-
+static void gail_util_init (GailUtil *utils);
/* atkutil.h */
static guint gail_util_add_global_event_listener (GSignalEmissionHook listener,
/* gailmisc/AtkMisc */
static void gail_misc_class_init (GailMiscClass *klass);
+static void gail_misc_init (GailMisc *misc);
static void gail_misc_threads_enter (AtkMisc *misc);
static void gail_misc_threads_leave (AtkMisc *misc);
gpointer func_data;
};
-GType
-gail_util_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailUtilClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_util_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailUtil), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (ATK_TYPE_UTIL,
- "GailUtil", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailUtil, gail_util, ATK_TYPE_UTIL)
static void
gail_util_class_init (GailUtilClass *klass)
_listener_info_destroy);
}
+static void
+gail_util_init (GailUtil *utils)
+{
+}
+
static guint
gail_util_add_global_event_listener (GSignalEmissionHook listener,
const gchar *event_type)
}
}
-GType
-gail_misc_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailMiscClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_misc_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailMisc), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- type = g_type_register_static (ATK_TYPE_MISC,
- "GailMisc", &tinfo, 0);
- }
- return type;
-}
+G_DEFINE_TYPE (GailMisc, gail_misc, ATK_TYPE_MISC)
static void
gail_misc_class_init (GailMiscClass *klass)
atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL);
}
+static void
+gail_misc_init (GailMisc *misc)
+{
+}
+
static void gail_misc_threads_enter (AtkMisc *misc)
{
GDK_THREADS_ENTER ();
extern GtkWidget *focus_widget;
static void gail_widget_class_init (GailWidgetClass *klass);
-
+static void gail_widget_init (GailWidget *accessible);
static void gail_widget_connect_widget_destroyed (GtkAccessible *accessible);
static void gail_widget_destroyed (GtkWidget *widget,
GtkAccessible *accessible);
static GtkWidget* gail_widget_find_viewport (GtkWidget *widget);
static gboolean gail_widget_on_screen (GtkWidget *widget);
-static gpointer parent_class = NULL;
-
-GType
-gail_widget_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailWidgetClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_widget_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailWidget), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_component_info =
- {
- (GInterfaceInitFunc) atk_component_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
-
- type = g_type_register_static (GTK_TYPE_ACCESSIBLE,
- "GailWidget", &tinfo, 0);
- g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
- &atk_component_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailWidget, gail_widget, GTK_TYPE_ACCESSIBLE,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
static void
gail_widget_class_init (GailWidgetClass *klass)
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
klass->notify_gtk = gail_widget_real_notify_gtk;
klass->focus_gtk = gail_widget_real_focus_gtk;
class->initialize = gail_widget_real_initialize;
}
+static void
+gail_widget_init (GailWidget *accessible)
+{
+}
+
/**
* This function specifies the GtkWidget for which the GailWidget was created
* and specifies a handler to be called when the GtkWidget is destroyed.
*/
return NULL;
- relation_set = ATK_OBJECT_CLASS (parent_class)->ref_relation_set (obj);
+ relation_set = ATK_OBJECT_CLASS (gail_widget_parent_class)->ref_relation_set (obj);
if (GTK_IS_BOX (widget) && !GTK_IS_COMBO (widget))
/*
GtkWidget *widget = GTK_ACCESSIBLE (accessible)->widget;
AtkStateSet *state_set;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_widget_parent_class)->ref_state_set (accessible);
if (widget == NULL)
{
static void
atk_component_interface_init (AtkComponentIface *iface)
{
- g_return_if_fail (iface != NULL);
-
/*
* Use default implementation for contains and get_position
*/
static void gail_window_class_init (GailWindowClass *klass);
+static void gail_window_init (GailWindow *accessible);
+
static void gail_window_real_initialize (AtkObject *obj,
gpointer data);
static void gail_window_finalize (GObject *object);
static guint gail_window_signals [LAST_SIGNAL] = { 0, };
-static gpointer parent_class = NULL;
-
-GType
-gail_window_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- static const GTypeInfo tinfo =
- {
- sizeof (GailWindowClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) gail_window_class_init, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
- NULL, /* class data */
- sizeof (GailWindow), /* instance size */
- 0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
- NULL /* value table */
- };
-
- static const GInterfaceInfo atk_component_info =
- {
- (GInterfaceInitFunc) atk_component_interface_init,
- (GInterfaceFinalizeFunc) NULL,
- NULL
- };
- type = g_type_register_static (GAIL_TYPE_CONTAINER,
- "GailWindow", &tinfo, 0);
-
- g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
- &atk_component_info);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailWindow, gail_window, GAIL_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
static void
gail_window_class_init (GailWindowClass *klass)
widget_class->focus_gtk = gail_window_real_focus_gtk;
widget_class->notify_gtk = gail_window_real_notify_gtk;
- parent_class = g_type_class_peek_parent (klass);
-
class->get_name = gail_window_get_name;
class->get_parent = gail_window_get_parent;
class->get_index_in_parent = gail_window_get_index_in_parent;
return accessible;
}
+static void
+gail_window_init (GailWindow *accessible)
+{
+}
+
static void
gail_window_real_initialize (AtkObject *obj,
gpointer data)
GtkWidget *widget;
GailWindow *window;
- ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+ ATK_OBJECT_CLASS (gail_window_parent_class)->initialize (obj, data);
window = GAIL_WINDOW (obj);
window->name_change_handler = 0;
window->previous_name = NULL;
}
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gail_window_parent_class)->finalize (object);
}
static G_CONST_RETURN gchar*
{
G_CONST_RETURN gchar* name;
- name = ATK_OBJECT_CLASS (parent_class)->get_name (accessible);
+ name = ATK_OBJECT_CLASS (gail_window_parent_class)->get_name (accessible);
if (name == NULL)
{
/*
{
AtkObject* parent;
- parent = ATK_OBJECT_CLASS (parent_class)->get_parent (accessible);
+ parent = ATK_OBJECT_CLASS (gail_window_parent_class)->get_parent (accessible);
return parent;
}
gail_return_val_if_fail (GTK_IS_WIDGET (widget), -1);
- index = ATK_OBJECT_CLASS (parent_class)->get_index_in_parent (accessible);
+ index = ATK_OBJECT_CLASS (gail_window_parent_class)->get_index_in_parent (accessible);
if (index != -1)
return index;
*/
return NULL;
- relation_set = ATK_OBJECT_CLASS (parent_class)->ref_relation_set (obj);
+ relation_set = ATK_OBJECT_CLASS (gail_window_parent_class)->ref_relation_set (obj);
if (atk_object_get_role (obj) == ATK_ROLE_TOOL_TIP)
{
GtkWindow *window;
GdkWindowState state;
- state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (accessible);
+ state_set = ATK_OBJECT_CLASS (gail_window_parent_class)->ref_state_set (accessible);
widget = GTK_ACCESSIBLE (accessible)->widget;
if (widget == NULL)
}
}
else
- GAIL_WIDGET_CLASS (parent_class)->notify_gtk (obj, pspec);
+ GAIL_WIDGET_CLASS (gail_window_parent_class)->notify_gtk (obj, pspec);
}
static gboolean
static void
atk_component_interface_init (AtkComponentIface *iface)
{
- gail_return_if_fail (iface != NULL);
-
iface->get_extents = gail_window_get_extents;
iface->get_size = gail_window_get_size;
iface->get_mdi_zorder = gail_window_get_mdi_zorder;
projects / ~andy / gtk / commitdiff