added gtkaccelmap.sgml. other updates.

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

diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 5a9b779aac59bceef5f1c46adba3fbf35d209be9..89529e88d47fa60b078f5f05a9bfde67540fdc70 100644 (file)
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -54,11 +54,13 @@ struct _GtkAccelLabel
 {
   GtkLabel label;
 
-  guint             queue_id;
-  guint             accel_padding;
-  GObject   *accel_object;
-  gchar     *accel_string;
-  guint16     accel_string_width;
+  guint                 queue_id;
+  guint                 accel_padding;
+  GtkWidget     *accel_widget;
+  GClosure     *accel_closure;
+  GtkAccelGroup *accel_group;
+  gchar         *accel_string;
+  guint16        accel_string_width;
 };
 
 struct _GtkAccelLabelClass
@@ -80,20 +82,15 @@ struct _GtkAccelLabelClass
 #endif /* GTK_DISABLE_DEPRECATED */
 
 GtkType           gtk_accel_label_get_type          (void) G_GNUC_CONST;
-GtkWidget *gtk_accel_label_new              (const gchar   *string);
-GObject   *gtk_accel_label_get_accel_object  (GtkAccelLabel *accel_label);
+GtkWidget* gtk_accel_label_new              (const gchar   *string);
+GtkWidget* gtk_accel_label_get_accel_widget  (GtkAccelLabel *accel_label);
 guint     gtk_accel_label_get_accel_width   (GtkAccelLabel *accel_label);
-void      gtk_accel_label_set_accel_object  (GtkAccelLabel *accel_label,
-                                             GObject       *accel_object);
+void      gtk_accel_label_set_accel_widget  (GtkAccelLabel *accel_label,
+                                             GtkWidget     *accel_widget);
+void      gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
+                                             GClosure      *closure);
 gboolean   gtk_accel_label_refetch           (GtkAccelLabel *accel_label);
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_accel_label_get_accel_widget(accel_label) \
-  GTK_WIDGET(gtk_accel_label_get_accel_object(acel_label))
-#define gtk_accel_label_set_accel_widget(accel_label, accel_widget) \
-  gtk_accel_label_set_accel_object((accel_label), G_OBJECT(accel_widget))
-#endif
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */