gtk/gtkassistant: gtk_misc_set_alignment replacing

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

diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 9ae54b2f8f28013bc927d573351e62622827d924..872c588e4771ff9d753568aa898ec1d345db5358 100644 (file)
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -27,7 +27,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -48,8 +48,9 @@ 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:
@@ -60,14 +61,7 @@ typedef struct _GtkAccelLabelClass  GtkAccelLabelClass;
 struct _GtkAccelLabel
 {
   GtkLabel label;
-
-  guint          GSEAL (gtk_reserved);
-  guint          GSEAL (accel_padding);      /* should be style property? */
-  GtkWidget     *GSEAL (accel_widget);       /* done*/
-  GClosure      *GSEAL (accel_closure);      /* has set function */
-  GtkAccelGroup *GSEAL (accel_group);        /* set by set_accel_closure() */
-  gchar         *GSEAL (accel_string);       /* has set function */
-  guint16        GSEAL (accel_string_width); /* seems to be private */
+  GtkAccelLabelPrivate *priv;
 };
 
 struct _GtkAccelLabelClass
@@ -80,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);
@@ -90,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);