Merged from stable.

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

diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 7e6dc56dd1611831ce04c0398b37bb4c0a375065..7fa585065339204a364b15c6b9d13529489d7f63 100644 (file)
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -2,23 +2,23 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000.  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/. 
@@ -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;
@@ -51,31 +51,42 @@ typedef struct _GtkFrameClass  GtkFrameClass;
 struct _GtkFrame
 {
   GtkBin bin;
-  
-  gchar *label;
+
+  GtkWidget *label_widget;
   gint16 shadow_type;
-  gint16 label_width;
-  gint16 label_height;
   gfloat label_xalign;
   gfloat label_yalign;
+
+  GtkAllocation child_allocation;
 };
 
 struct _GtkFrameClass
 {
   GtkBinClass parent_class;
-};
 
+  void (*compute_child_allocation) (GtkFrame *frame, GtkAllocation *allocation);
+};
 
-GtkType    gtk_frame_get_type        (void);
-GtkWidget* gtk_frame_new             (const gchar   *label);
-void       gtk_frame_set_label       (GtkFrame      *frame,
-                                     const gchar   *label);
-void       gtk_frame_set_label_align (GtkFrame      *frame,
-                                     gfloat         xalign,
-                                     gfloat         yalign);
-void       gtk_frame_set_shadow_type (GtkFrame      *frame,
-                                     GtkShadowType  type);
 
+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);
+G_CONST_RETURN gchar *gtk_frame_get_label (GtkFrame    *frame);
+
+void       gtk_frame_set_label_widget (GtkFrame      *frame,
+                                      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
 }