forked from AuroraMiddleware/gtk
gtktoggleaction: move public members to private structure
This commit is contained in:
parent
3ce68cd5de
commit
18a06d6b6a
@ -78,7 +78,6 @@ IGNORE_HFILES= \
|
||||
gtktexttypes.h \
|
||||
gtktextutil.h \
|
||||
gtkthemes.h \
|
||||
gtktoggleactionprivate.h \
|
||||
gtktrayicon.h \
|
||||
gtktreedatalist.h \
|
||||
gtktreeprivate.h \
|
||||
|
@ -392,7 +392,6 @@ gtk_private_h_sources = \
|
||||
gtktexttypes.h \
|
||||
gtktextutil.h \
|
||||
gtkthemes.h \
|
||||
gtktoggleactionprivate.h\
|
||||
gtktoolpaletteprivate.h \
|
||||
gtktreedatalist.h \
|
||||
gtktreeprivate.h \
|
||||
|
@ -32,7 +32,6 @@
|
||||
|
||||
#include "gtkradioaction.h"
|
||||
#include "gtkradiomenuitem.h"
|
||||
#include "gtktoggleactionprivate.h"
|
||||
#include "gtktoggletoolbutton.h"
|
||||
#include "gtkintl.h"
|
||||
#include "gtkprivate.h"
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -55,8 +55,7 @@ struct _GtkToggleAction
|
||||
GtkAction parent;
|
||||
|
||||
/*< private >*/
|
||||
|
||||
GtkToggleActionPrivate *GSEAL (private_data);
|
||||
GtkToggleActionPrivate *private_data;
|
||||
};
|
||||
|
||||
struct _GtkToggleActionClass
|
||||
|
@ -1,43 +0,0 @@
|
||||
/*
|
||||
* GTK - The GIMP Toolkit
|
||||
* Copyright (C) 1998, 1999 Red Hat, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This Library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This Library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with the Gnome Library; see the file COPYING.LIB. If not,
|
||||
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Author: James Henstridge <james@daa.com.au>
|
||||
*
|
||||
* Modified by the GTK+ Team and others 2003. See the AUTHORS
|
||||
* file for a list of people on the GTK+ Team. See the ChangeLog
|
||||
* files for a list of changes. These files are distributed with
|
||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||
*/
|
||||
|
||||
#ifndef __GTK_TOGGLE_ACTION_PRIVATE_H__
|
||||
#define __GTK_TOGGLE_ACTION_PRIVATE_H__
|
||||
|
||||
|
||||
#define GTK_TOGGLE_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TOGGLE_ACTION, GtkToggleActionPrivate))
|
||||
|
||||
struct _GtkToggleActionPrivate
|
||||
{
|
||||
guint active : 1;
|
||||
guint draw_as_radio : 1;
|
||||
};
|
||||
|
||||
#endif /* __GTK_TOGGLE_ACTION_PRIVATE_H__ */
|
Loading…
Reference in New Issue
Block a user