move a few '{' to their own lines so all enums here have the same style.

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

diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 1df1293d308b9bb7d3f275b5a15dd87cf0cec2ad..e85888c6e1d4f16d6be3e496bc189f2725315e59 100644 (file)
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -18,7 +18,7 @@
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2001.  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/. 
@@ -29,20 +29,16 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
 #include <gtk/gtkframe.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ASPECT_FRAME            (gtk_aspect_frame_get_type ())
-#define GTK_ASPECT_FRAME(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame))
-#define GTK_ASPECT_FRAME_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
-#define GTK_IS_ASPECT_FRAME(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_ASPECT_FRAME))
-#define GTK_IS_ASPECT_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
-#define GTK_ASPECT_FRAME_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
+#define GTK_ASPECT_FRAME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame))
+#define GTK_ASPECT_FRAME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
+#define GTK_IS_ASPECT_FRAME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ASPECT_FRAME))
+#define GTK_IS_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
+#define GTK_ASPECT_FRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
 
 
 typedef struct _GtkAspectFrame       GtkAspectFrame;
@@ -62,11 +58,11 @@ struct _GtkAspectFrame
 
 struct _GtkAspectFrameClass
 {
-  GtkBinClass parent_class;
+  GtkFrameClass parent_class;
 };
 
 
-GtkType    gtk_aspect_frame_get_type   (void) G_GNUC_CONST;
+GType      gtk_aspect_frame_get_type   (void) G_GNUC_CONST;
 GtkWidget* gtk_aspect_frame_new        (const gchar     *label,
                                        gfloat           xalign,
                                        gfloat           yalign,
@@ -79,9 +75,6 @@ void       gtk_aspect_frame_set        (GtkAspectFrame  *aspect_frame,
                                        gboolean         obey_child);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_ASPECT_FRAME_H__ */