X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkframe.h;h=ffc90c9017d59c2f110be15c5faf61c6007fa5fb;hb=dc331ccb171151d737112d8dc55b25709271d2c7;hp=8c3aa855f1870ccc6dc0aaac1a352146d5ffe80c;hpb=5f1b5d24067468fc86b28dccc504c71abdaf68b8;p=~andy%2Fgtk

diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 8c3aa855f..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 <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_FRAME_H__
 #define __GTK_FRAME_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbin.h>
 
 
@@ -45,16 +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 _GtkFramePriv   GtkFramePriv;
-typedef struct _GtkFrameClass  GtkFrameClass;
+typedef struct _GtkFrame              GtkFrame;
+typedef struct _GtkFramePrivate       GtkFramePrivate;
+typedef struct _GtkFrameClass         GtkFrameClass;
 
 struct _GtkFrame
 {
   GtkBin bin;
 
-  /* <private> */
-  GtkFramePriv *priv;
+  /*< private >*/
+  GtkFramePrivate *priv;
 };
 
 struct _GtkFrameClass
@@ -62,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);