callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkLinkButtonAccessible: add a private struct

Browse Source 
Move instance fields to a private struct, in preparation
for installing a11y headers.
This commit is contained in:
Matthias Clasen
2012-10-14 19:55:59 -04:00
parent b8e4543ff3
commit 9a41636988
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/a11y/gtklinkbuttonaccessible.c
View File

@ -23,6 +23,11 @@
typedef struct _GtkLinkButtonAccessibleLink GtkLinkButtonAccessibleLink; typedef struct _GtkLinkButtonAccessibleLink GtkLinkButtonAccessibleLink;
typedef struct _GtkLinkButtonAccessibleLinkClass GtkLinkButtonAccessibleLinkClass; typedef struct _GtkLinkButtonAccessibleLinkClass GtkLinkButtonAccessibleLinkClass;
struct _GtkLinkButtonAccessiblePrivate
{
AtkHyperlink *link;
};
struct _GtkLinkButtonAccessibleLink struct _GtkLinkButtonAccessibleLink
{ {
AtkHyperlink parent; AtkHyperlink parent;
@ -180,14 +185,14 @@ gtk_link_button_accessible_get_hyperlink (AtkHyperlinkImpl *impl)
{ {
GtkLinkButtonAccessible *button = GTK_LINK_BUTTON_ACCESSIBLE (impl); GtkLinkButtonAccessible *button = GTK_LINK_BUTTON_ACCESSIBLE (impl);
if (!button->link) if (!button->priv->link)
{ {
button->link = gtk_link_button_accessible_link_new (button); button->priv->link = gtk_link_button_accessible_link_new (button);
g_signal_connect (gtk_accessible_get_widget (GTK_ACCESSIBLE (button)), g_signal_connect (gtk_accessible_get_widget (GTK_ACCESSIBLE (button)),
"activate-link", G_CALLBACK (activate_link), button->link); "activate-link", G_CALLBACK (activate_link), button->priv->link);
} }
return g_object_ref (button->link); return g_object_ref (button->priv->link);
} }
static void atk_hypertext_impl_interface_init (AtkHyperlinkImplIface *iface); static void atk_hypertext_impl_interface_init (AtkHyperlinkImplIface *iface);
@ -198,6 +203,9 @@ G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessible, _gtk_link_button_accessible, G
static void static void
_gtk_link_button_accessible_init (GtkLinkButtonAccessible *button) _gtk_link_button_accessible_init (GtkLinkButtonAccessible *button)
{ {
button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
GTK_TYPE_LINK_BUTTON_ACCESSIBLE,
GtkLinkButtonAccessiblePrivate);
} }
static void static void
@ -205,8 +213,8 @@ gtk_link_button_accessible_finalize (GObject *object)
{ {
GtkLinkButtonAccessible *button = GTK_LINK_BUTTON_ACCESSIBLE (object); GtkLinkButtonAccessible *button = GTK_LINK_BUTTON_ACCESSIBLE (object);
if (button->link) if (button->priv->link)
g_object_unref (button->link); g_object_unref (button->priv->link);
G_OBJECT_CLASS (_gtk_link_button_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (_gtk_link_button_accessible_parent_class)->finalize (object);
} }
@ -215,6 +223,8 @@ static void
_gtk_link_button_accessible_class_init (GtkLinkButtonAccessibleClass *klass) _gtk_link_button_accessible_class_init (GtkLinkButtonAccessibleClass *klass)
{ {
G_OBJECT_CLASS (klass)->finalize = gtk_link_button_accessible_finalize; G_OBJECT_CLASS (klass)->finalize = gtk_link_button_accessible_finalize;
g_type_class_add_private (klass, sizeof (GtkLinkButtonAccessiblePrivate));
} }
static void static void

7
gtk/a11y/gtklinkbuttonaccessible.h
View File

@ -29,14 +29,15 @@ G_BEGIN_DECLS
#define GTK_IS_LINK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LINK_BUTTON_ACCESSIBLE)) #define GTK_IS_LINK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LINK_BUTTON_ACCESSIBLE))
#define GTK_LINK_BUTTON_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessibleClass)) #define GTK_LINK_BUTTON_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessibleClass))
typedef struct _GtkLinkButtonAccessible GtkLinkButtonAccessible; typedef struct _GtkLinkButtonAccessible GtkLinkButtonAccessible;
typedef struct _GtkLinkButtonAccessibleClass GtkLinkButtonAccessibleClass; typedef struct _GtkLinkButtonAccessibleClass GtkLinkButtonAccessibleClass;
typedef struct _GtkLinkButtonAccessiblePrivate GtkLinkButtonAccessiblePrivate;
struct _GtkLinkButtonAccessible struct _GtkLinkButtonAccessible
{ {
GtkButtonAccessible parent; GtkButtonAccessible parent;
AtkHyperlink *link; GtkLinkButtonAccessiblePrivate *priv;
}; };
struct _GtkLinkButtonAccessibleClass struct _GtkLinkButtonAccessibleClass