X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkframe.h;h=ffc90c9017d59c2f110be15c5faf61c6007fa5fb;hb=ea043cab5718304d9b6170afa2d3f959fc99c718;hp=13d70d143ae44f1bc2f94db85167f3c59ab9677d;hpb=2c5f8a5c2baf4409e01139eadf2589ca46fe29cc;p=~andy%2Fgtk
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 13d70d143..ffc90c901 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -12,9 +12,7 @@
* 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 .
*/
/*
@@ -24,15 +22,14 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#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
@@ -46,20 +43,16 @@ G_BEGIN_DECLS
#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
@@ -67,15 +60,21 @@ 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);
};
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 (GtkFrame *frame,
+ const gchar *label);
+const gchar * gtk_frame_get_label (GtkFrame *frame);
void gtk_frame_set_label_widget (GtkFrame *frame,
GtkWidget *label_widget);