[gtk+] GtkLinkButtonAccessible: add a private struct
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkLinkButtonAccessible: add a private struct
- Date: Mon, 15 Oct 2012 10:40:30 +0000 (UTC)
commit 9a416369887f2110404c7e6cafd5fcb91cc489a3
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Oct 14 19:55:59 2012 -0400
GtkLinkButtonAccessible: add a private struct
Move instance fields to a private struct, in preparation
for installing a11y headers.
gtk/a11y/gtklinkbuttonaccessible.c | 22 ++++++++++++++++------
gtk/a11y/gtklinkbuttonaccessible.h | 7 ++++---
2 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/gtk/a11y/gtklinkbuttonaccessible.c b/gtk/a11y/gtklinkbuttonaccessible.c
index 9e002f2..ee931b2 100644
--- a/gtk/a11y/gtklinkbuttonaccessible.c
+++ b/gtk/a11y/gtklinkbuttonaccessible.c
@@ -23,6 +23,11 @@
typedef struct _GtkLinkButtonAccessibleLink GtkLinkButtonAccessibleLink;
typedef struct _GtkLinkButtonAccessibleLinkClass GtkLinkButtonAccessibleLinkClass;
+struct _GtkLinkButtonAccessiblePrivate
+{
+ AtkHyperlink *link;
+};
+
struct _GtkLinkButtonAccessibleLink
{
AtkHyperlink parent;
@@ -180,14 +185,14 @@ gtk_link_button_accessible_get_hyperlink (AtkHyperlinkImpl *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)),
- "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);
@@ -198,6 +203,9 @@ G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessible, _gtk_link_button_accessible, G
static void
_gtk_link_button_accessible_init (GtkLinkButtonAccessible *button)
{
+ button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
+ GTK_TYPE_LINK_BUTTON_ACCESSIBLE,
+ GtkLinkButtonAccessiblePrivate);
}
static void
@@ -205,8 +213,8 @@ gtk_link_button_accessible_finalize (GObject *object)
{
GtkLinkButtonAccessible *button = GTK_LINK_BUTTON_ACCESSIBLE (object);
- if (button->link)
- g_object_unref (button->link);
+ if (button->priv->link)
+ g_object_unref (button->priv->link);
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)
{
G_OBJECT_CLASS (klass)->finalize = gtk_link_button_accessible_finalize;
+
+ g_type_class_add_private (klass, sizeof (GtkLinkButtonAccessiblePrivate));
}
static void
diff --git a/gtk/a11y/gtklinkbuttonaccessible.h b/gtk/a11y/gtklinkbuttonaccessible.h
index cf3f981..ef7ef9e 100644
--- a/gtk/a11y/gtklinkbuttonaccessible.h
+++ b/gtk/a11y/gtklinkbuttonaccessible.h
@@ -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_LINK_BUTTON_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessibleClass))
-typedef struct _GtkLinkButtonAccessible GtkLinkButtonAccessible;
-typedef struct _GtkLinkButtonAccessibleClass GtkLinkButtonAccessibleClass;
+typedef struct _GtkLinkButtonAccessible GtkLinkButtonAccessible;
+typedef struct _GtkLinkButtonAccessibleClass GtkLinkButtonAccessibleClass;
+typedef struct _GtkLinkButtonAccessiblePrivate GtkLinkButtonAccessiblePrivate;
struct _GtkLinkButtonAccessible
{
GtkButtonAccessible parent;
- AtkHyperlink *link;
+ GtkLinkButtonAccessiblePrivate *priv;
};
struct _GtkLinkButtonAccessibleClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]