Rename property to be more neutral

[~andy/gtk] / gtk / gtktogglebutton.h

diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 009688a7b246eb2aeba06491a68324150280075e..1183c9bfc2175850882cb88d69cf8f4a3b0877ed 100644 (file)
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,17 +22,17 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TOGGLE_BUTTON_H__
 #define __GTK_TOGGLE_BUTTON_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbutton.h>
 
+
 G_BEGIN_DECLS
 
 #define GTK_TYPE_TOGGLE_BUTTON                  (gtk_toggle_button_get_type ())
@@ -44,17 +42,16 @@ G_BEGIN_DECLS
 #define GTK_IS_TOGGLE_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_BUTTON))
 #define GTK_TOGGLE_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButtonClass))
 
-
-typedef struct _GtkToggleButton       GtkToggleButton;
-typedef struct _GtkToggleButtonClass  GtkToggleButtonClass;
+typedef struct _GtkToggleButton              GtkToggleButton;
+typedef struct _GtkToggleButtonPrivate       GtkToggleButtonPrivate;
+typedef struct _GtkToggleButtonClass         GtkToggleButtonClass;
 
 struct _GtkToggleButton
 {
+  /*< private >*/
   GtkButton button;
 
-  guint GSEAL (active) : 1;
-  guint GSEAL (draw_indicator) : 1;
-  guint GSEAL (inconsistent) : 1;
+  GtkToggleButtonPrivate *priv;
 };
 
 struct _GtkToggleButtonClass
@@ -87,10 +84,9 @@ void       gtk_toggle_button_set_inconsistent  (GtkToggleButton *toggle_button,
                                                 gboolean         setting);
 gboolean   gtk_toggle_button_get_inconsistent  (GtkToggleButton *toggle_button);
 
+void       _gtk_toggle_button_set_active       (GtkToggleButton *toggle_button,
+                                                gboolean         is_active);
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define        gtk_toggle_button_set_state             gtk_toggle_button_set_active
-#endif /* GTK_DISABLE_DEPRECATED */
 
 G_END_DECLS