X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkframe.h;h=ffc90c9017d59c2f110be15c5faf61c6007fa5fb;hb=3b2182e711ace4a2d6843848208224cd7525d530;hp=caeb47bd510b4f1c911438947b3e23eb23db2546;hpb=9ae724bf4d72d1eed98f3e55a640b31ff552e8f1;p=~andy%2Fgtk

diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index caeb47bd5..ffc90c901 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -2,62 +2,57 @@
  * 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
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
- * 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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_FRAME_H__
 #define __GTK_FRAME_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #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;
-typedef struct _GtkFrameClass  GtkFrameClass;
+typedef struct _GtkFrame              GtkFrame;
+typedef struct _GtkFramePrivate       GtkFramePrivate;
+typedef struct _GtkFrameClass         GtkFrameClass;
 
 struct _GtkFrame
 {
   GtkBin bin;
 
-  GtkWidget *label_widget;
-  gint16 shadow_type;
-  gfloat label_xalign;
-  gfloat label_yalign;
-
-  GtkAllocation child_allocation;
+  /*< private >*/
+  GtkFramePrivate *priv;
 };
 
 struct _GtkFrameClass
@@ -65,25 +60,37 @@ struct _GtkFrameClass
   GtkBinClass parent_class;
 
   void (*compute_child_allocation) (GtkFrame *frame, GtkAllocation *allocation);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-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);
-gchar *    gtk_frame_get_label        (GtkFrame      *frame);
+
+void          gtk_frame_set_label (GtkFrame    *frame,
+                                   const gchar *label);
+const 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
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_FRAME_H__ */