Practically everything changed.

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

diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 497566f7216c96b76aaf3a1190b93af0ec82c15a..ebab8d40324469249da4be4943a211613ab94e4a 100644 (file)
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -21,9 +21,13 @@
  * 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_MISC_H__
 #define __GTK_MISC_H__
 
@@ -32,17 +36,14 @@
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_MISC                 (gtk_misc_get_type ())
-#define GTK_MISC(obj)                 (GTK_CHECK_CAST ((obj), GTK_TYPE_MISC, GtkMisc))
-#define GTK_MISC_CLASS(klass)         (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MISC, GtkMiscClass))
-#define GTK_IS_MISC(obj)              (GTK_CHECK_TYPE ((obj), GTK_TYPE_MISC))
-#define GTK_IS_MISC_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MISC))
-#define GTK_MISC_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MISC, GtkMiscClass))
+#define GTK_MISC(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MISC, GtkMisc))
+#define GTK_MISC_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MISC, GtkMiscClass))
+#define GTK_IS_MISC(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MISC))
+#define GTK_IS_MISC_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MISC))
+#define GTK_MISC_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MISC, GtkMiscClass))
 
 
 typedef struct _GtkMisc              GtkMisc;
@@ -52,11 +53,11 @@ struct _GtkMisc
 {
   GtkWidget widget;
   
-  gfloat xalign;
-  gfloat yalign;
+  gfloat GSEAL (xalign);
+  gfloat GSEAL (yalign);
   
-  guint16 xpad;
-  guint16 ypad;
+  guint16 GSEAL (xpad);
+  guint16 GSEAL (ypad);
 };
 
 struct _GtkMiscClass
@@ -65,18 +66,21 @@ struct _GtkMiscClass
 };
 
 
-GtkType gtk_misc_get_type      (void);
+GType   gtk_misc_get_type      (void) G_GNUC_CONST;
 void   gtk_misc_set_alignment (GtkMisc *misc,
                                gfloat   xalign,
                                gfloat   yalign);
+void    gtk_misc_get_alignment (GtkMisc *misc,
+                               gfloat  *xalign,
+                               gfloat  *yalign);
 void   gtk_misc_set_padding   (GtkMisc *misc,
                                gint     xpad,
                                gint     ypad);
+void    gtk_misc_get_padding   (GtkMisc *misc,
+                               gint    *xpad,
+                               gint    *ypad);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MISC_H__ */