[gtk+] gtktoggleaction: move public members to private structure
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtktoggleaction: move public members to private structure
- Date: Tue, 13 Jul 2010 23:19:33 +0000 (UTC)
commit 18a06d6b6a125b70db45180c6152985649fc1205
Author: Javier Jardón <jjardon gnome org>
Date: Tue Jul 13 20:27:16 2010 +0200
gtktoggleaction: move public members to private structure
docs/reference/gtk/Makefile.am | 1 -
gtk/Makefile.am | 1 -
gtk/gtkradioaction.c | 1 -
gtk/gtktoggleaction.c | 10 +++++++-
gtk/gtktoggleaction.h | 3 +-
gtk/gtktoggleactionprivate.h | 43 ----------------------------------------
6 files changed, 9 insertions(+), 50 deletions(-)
---
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 1e0ad40..103e508 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -78,7 +78,6 @@ IGNORE_HFILES= \
gtktexttypes.h \
gtktextutil.h \
gtkthemes.h \
- gtktoggleactionprivate.h \
gtktrayicon.h \
gtktreedatalist.h \
gtktreeprivate.h \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 99b37a4..ebe87fe 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -392,7 +392,6 @@ gtk_private_h_sources = \
gtktexttypes.h \
gtktextutil.h \
gtkthemes.h \
- gtktoggleactionprivate.h\
gtktoolpaletteprivate.h \
gtktreedatalist.h \
gtktreeprivate.h \
diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c
index fbc4557..96f1163 100644
--- a/gtk/gtkradioaction.c
+++ b/gtk/gtkradioaction.c
@@ -32,7 +32,6 @@
#include "gtkradioaction.h"
#include "gtkradiomenuitem.h"
-#include "gtktoggleactionprivate.h"
#include "gtktoggletoolbutton.h"
#include "gtkintl.h"
#include "gtkprivate.h"
diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c
index 549d101..ae82082 100644
--- a/gtk/gtktoggleaction.c
+++ b/gtk/gtktoggleaction.c
@@ -32,7 +32,6 @@
#include "gtkintl.h"
#include "gtktoggleaction.h"
-#include "gtktoggleactionprivate.h"
#include "gtktoggletoolbutton.h"
#include "gtktogglebutton.h"
#include "gtkcheckmenuitem.h"
@@ -48,6 +47,11 @@
* "active" state specifying whether the action has been checked or not.
*/
+struct _GtkToggleActionPrivate
+{
+ guint active : 1;
+ guint draw_as_radio : 1;
+};
enum
{
@@ -152,7 +156,9 @@ gtk_toggle_action_class_init (GtkToggleActionClass *klass)
static void
gtk_toggle_action_init (GtkToggleAction *action)
{
- action->private_data = GTK_TOGGLE_ACTION_GET_PRIVATE (action);
+ action->private_data = G_TYPE_INSTANCE_GET_PRIVATE (action,
+ GTK_TYPE_TOGGLE_ACTION,
+ GtkToggleActionPrivate);
action->private_data->active = FALSE;
action->private_data->draw_as_radio = FALSE;
}
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index 2cdf3fd..c34336e 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -55,8 +55,7 @@ struct _GtkToggleAction
GtkAction parent;
/*< private >*/
-
- GtkToggleActionPrivate *GSEAL (private_data);
+ GtkToggleActionPrivate *private_data;
};
struct _GtkToggleActionClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]