gtk/gtkassistant: gtk_misc_set_alignment replacing

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

diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 4eb842a610c1ef4190efb395b6bc47f9237155ca..872c588e4771ff9d753568aa898ec1d345db5358 100644 (file)
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -24,9 +24,13 @@
  * Modified by the GTK+ Team and others 1997-2001.  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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_ACCEL_LABEL_H__
 #define __GTK_ACCEL_LABEL_H__
 
@@ -44,20 +48,20 @@ G_BEGIN_DECLS
 #define GTK_ACCEL_LABEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
 
 
-typedef struct _GtkAccelLabel      GtkAccelLabel;
-typedef struct _GtkAccelLabelClass  GtkAccelLabelClass;
+typedef struct _GtkAccelLabel       GtkAccelLabel;
+typedef struct _GtkAccelLabelClass   GtkAccelLabelClass;
+typedef struct _GtkAccelLabelPrivate GtkAccelLabelPrivate;
 
+/**
+ * GtkAccelLabel:
+ *
+ * The #GtkAccelLabel-struct struct contains private data only, and
+ * should be accessed using the functions below.
+ */
 struct _GtkAccelLabel
 {
   GtkLabel label;
-
-  guint                 gtk_reserved;
-  guint                 accel_padding;
-  GtkWidget     *accel_widget;
-  GClosure     *accel_closure;
-  GtkAccelGroup *accel_group;
-  gchar         *accel_string;
-  guint16        accel_string_width;
+  GtkAccelLabelPrivate *priv;
 };
 
 struct _GtkAccelLabelClass
@@ -70,9 +74,7 @@ struct _GtkAccelLabelClass
   gchar                *mod_name_control;
   gchar                *mod_name_alt;
   gchar                *mod_separator;
-  gchar                *accel_seperator;
-  guint                 latin1_to_char : 1;
-  
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -80,9 +82,6 @@ struct _GtkAccelLabelClass
   void (*_gtk_reserved4) (void);
 };
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define        gtk_accel_label_accelerator_width       gtk_accel_label_get_accel_width
-#endif /* GTK_DISABLE_DEPRECATED */
 
 GType     gtk_accel_label_get_type          (void) G_GNUC_CONST;
 GtkWidget* gtk_accel_label_new              (const gchar   *string);