[doc] Fix the documentation of GtkIconEntry

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

diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 8f45fa1214dd65e89cf133bdb4b690b8ba7e536f..4fad3027e3699b68a6e811e8768d060ddf55b41d 100644 (file)
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -21,21 +21,21 @@
  * 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/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_ALIGNMENT_H__
 #define __GTK_ALIGNMENT_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ALIGNMENT                  (gtk_alignment_get_type ())
 #define GTK_ALIGNMENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ALIGNMENT, GtkAlignment))
@@ -43,7 +43,6 @@ extern "C" {
 #define GTK_IS_ALIGNMENT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ALIGNMENT))
 #define GTK_IS_ALIGNMENT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ALIGNMENT))
 #define GTK_ALIGNMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
-#define GTK_ALIGNMENT_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ALIGNMENT, GtkAlignmentPrivate))
 
 
 typedef struct _GtkAlignment       GtkAlignment;
@@ -54,10 +53,10 @@ struct _GtkAlignment
 {
   GtkBin bin;
 
-  gfloat xalign;
-  gfloat yalign;
-  gfloat xscale;
-  gfloat yscale;
+  gfloat GSEAL (xalign);
+  gfloat GSEAL (yalign);
+  gfloat GSEAL (xscale);
+  gfloat GSEAL (yscale);
 };
 
 struct _GtkAlignmentClass
@@ -89,9 +88,7 @@ void       gtk_alignment_get_padding (GtkAlignment      *alignment,
                                      guint             *padding_left,
                                      guint             *padding_right);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_ALIGNMENT_H__ */