X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkframe.h;h=ffc90c9017d59c2f110be15c5faf61c6007fa5fb;hb=3b2182e711ace4a2d6843848208224cd7525d530;hp=89b97bfc063805c13b19477e97f6ad34f4518e96;hpb=0176b387c85a150b7d6fdac22be6db627d523217;p=~andy%2Fgtk
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 89b97bfc0..ffc90c901 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -12,52 +12,47 @@
* Lesser General Public License for more details.
*
* 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.
+ * License along with this library. If not, see .
*/
/*
* 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
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
-#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,26 +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) G_GNUC_CONST;
+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);
+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__ */