Really free the list. (#158422, Morten Welinder)

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

diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 0e8125f88f78afa66dfc54d6c3302f90c88ccd7b..7fa585065339204a364b15c6b9d13529489d7f63 100644 (file)
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -38,11 +38,11 @@ extern "C" {
 
 
 #define GTK_TYPE_FRAME                  (gtk_frame_get_type ())
-#define GTK_FRAME(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_FRAME, GtkFrame))
-#define GTK_FRAME_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAME, GtkFrameClass))
-#define GTK_IS_FRAME(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_FRAME))
-#define GTK_IS_FRAME_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FRAME))
-#define GTK_FRAME_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_FRAME, GtkFrameClass))
+#define GTK_FRAME(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FRAME, GtkFrame))
+#define GTK_FRAME_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAME, GtkFrameClass))
+#define GTK_IS_FRAME(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FRAME))
+#define GTK_IS_FRAME_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FRAME))
+#define GTK_FRAME_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FRAME, GtkFrameClass))
 
 
 typedef struct _GtkFrame       GtkFrame;
@@ -68,19 +68,25 @@ struct _GtkFrameClass
 };
 
 
-GtkType    gtk_frame_get_type         (void);
+GType      gtk_frame_get_type         (void) G_GNUC_CONST;
 GtkWidget* gtk_frame_new              (const gchar   *label);
-void       gtk_frame_set_label        (GtkFrame      *frame,
-                                      const gchar   *label);
-/* Temporarily commented out until memory management behavior is figured out */
-/* gchar *    gtk_frame_get_label        (GtkFrame      *frame); */
+
+void                  gtk_frame_set_label (GtkFrame    *frame,
+                                          const gchar *label);
+G_CONST_RETURN gchar *gtk_frame_get_label (GtkFrame    *frame);
+
 void       gtk_frame_set_label_widget (GtkFrame      *frame,
-                                      GtkWidget     *title_widget);
+                                      GtkWidget     *label_widget);
+GtkWidget *gtk_frame_get_label_widget (GtkFrame      *frame);
 void       gtk_frame_set_label_align  (GtkFrame      *frame,
                                       gfloat         xalign,
                                       gfloat         yalign);
+void       gtk_frame_get_label_align  (GtkFrame      *frame,
+                                      gfloat        *xalign,
+                                      gfloat        *yalign);
 void       gtk_frame_set_shadow_type  (GtkFrame      *frame,
                                       GtkShadowType  type);
+GtkShadowType gtk_frame_get_shadow_type (GtkFrame    *frame);
 
 #ifdef __cplusplus
 }