Fix typos

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

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 494069864f9ae4f1d2c6d84abe10a771b11c68d3..90b97ab180391665d3865888a82460f33636126c 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -39,27 +39,27 @@ G_BEGIN_DECLS
  * many of these are just aliases for GLib types to maintain
  * compatibility
  */
-typedef enum   /*< skip >*/
-{
-  GTK_TYPE_INVALID     = G_TYPE_INVALID,
-  GTK_TYPE_NONE                = G_TYPE_NONE,
-  GTK_TYPE_ENUM                = G_TYPE_ENUM,
-  GTK_TYPE_FLAGS       = G_TYPE_FLAGS,
-
-  /* GtkArg types */
-  GTK_TYPE_CHAR                = G_TYPE_CHAR,
-  GTK_TYPE_UCHAR       = G_TYPE_UCHAR,
-  GTK_TYPE_BOOL                = G_TYPE_BOOLEAN,
-  GTK_TYPE_INT         = G_TYPE_INT,
-  GTK_TYPE_UINT                = G_TYPE_UINT,
-  GTK_TYPE_LONG                = G_TYPE_LONG,
-  GTK_TYPE_ULONG       = G_TYPE_ULONG,
-  GTK_TYPE_FLOAT       = G_TYPE_FLOAT,
-  GTK_TYPE_DOUBLE      = G_TYPE_DOUBLE,
-  GTK_TYPE_STRING      = G_TYPE_STRING,
-  GTK_TYPE_BOXED       = G_TYPE_BOXED,
-  GTK_TYPE_POINTER     = G_TYPE_POINTER
-} GtkFundamentalType;
+
+#define GTK_TYPE_INVALID G_TYPE_INVALID
+#define GTK_TYPE_NONE    G_TYPE_NONE
+#define GTK_TYPE_ENUM    G_TYPE_ENUM
+#define GTK_TYPE_FLAGS   G_TYPE_FLAGS
+
+/* GtkArg types */
+#define GTK_TYPE_CHAR    G_TYPE_CHAR
+#define GTK_TYPE_UCHAR   G_TYPE_UCHAR
+#define GTK_TYPE_BOOL    G_TYPE_BOOLEAN
+#define GTK_TYPE_INT     G_TYPE_INT
+#define GTK_TYPE_UINT    G_TYPE_UINT
+#define GTK_TYPE_LONG    G_TYPE_LONG
+#define GTK_TYPE_ULONG   G_TYPE_ULONG
+#define GTK_TYPE_FLOAT   G_TYPE_FLOAT
+#define GTK_TYPE_DOUBLE  G_TYPE_DOUBLE
+#define GTK_TYPE_STRING  G_TYPE_STRING
+#define GTK_TYPE_BOXED   G_TYPE_BOXED
+#define GTK_TYPE_POINTER G_TYPE_POINTER
+
+typedef GType GtkFundamentalType;
 
 /* --- type macros --- */
 #define GTK_CLASS_NAME(class)          (g_type_name (G_TYPE_FROM_CLASS (class)))
@@ -105,6 +105,9 @@ G_END_DECLS
 
 G_BEGIN_DECLS
 
+/* urg */
+#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
+GType gtk_identifier_get_type (void) G_GNUC_CONST;
 
 /* --- typedefs --- */
 /* here we come with some necessary forward declarations for structures and
@@ -124,6 +127,10 @@ typedef void (*GtkSignalFunc)       (void);
 #ifndef GTK_DISABLE_DEPRECATED
 typedef struct _GtkTypeInfo         GtkTypeInfo;
 typedef GSignalCMarshaller          GtkSignalMarshaller;
+#endif
+
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+/* Used by gtk_container_foreach_unmarshal () */
 
 /* GtkArg, used to hold differently typed values */
 struct _GtkArg
@@ -162,7 +169,7 @@ struct _GtkArg
 
 /* argument value access macros, these must not contain casts,
  * to allow the usage of these macros in combination with the
- * adress operator, e.g. &GTK_VALUE_CHAR (*arg)
+ * address operator, e.g. &GTK_VALUE_CHAR (*arg)
  */
 #define GTK_VALUE_CHAR(a)      ((a).d.char_data)
 #define GTK_VALUE_UCHAR(a)     ((a).d.uchar_data)
@@ -180,7 +187,9 @@ struct _GtkArg
 #define GTK_VALUE_OBJECT(a)    ((a).d.object_data)
 #define GTK_VALUE_POINTER(a)   ((a).d.pointer_data)
 #define GTK_VALUE_SIGNAL(a)    ((a).d.signal_data)
+#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
 
+#ifndef GTK_DISABLE_DEPRECATED
 /* return location macros, these all narrow down to
  * pointer types, because return values need to be
  * passed by reference
@@ -234,9 +243,6 @@ gpointer    gtk_type_new    (GtkType         type);
 #define        gtk_type_parent(type)            g_type_parent (type)
 #define        gtk_type_is_a(type, is_a_type)   g_type_is_a ((type), (is_a_type))
 
-/* deprecated, use g_type_init() instead */
-void           gtk_type_init   (GTypeDebugFlags debug_flags);
-
 /* enum/flags compatibility functions, we strongly
  * recommend to use the glib enum/flags classes directly
  */
@@ -249,21 +255,13 @@ GtkEnumValue*     gtk_type_enum_find_value        (GtkType         enum_type,
 GtkFlagValue*  gtk_type_flags_find_value       (GtkType         flags_type,
                                                 const gchar    *value_name);
 
-#ifdef G_OS_WIN32
-#  ifdef GTK_COMPILATION
-#    define GTKTYPEUTILS_VAR __declspec(dllexport)
-#  else
-#    define GTKTYPEUTILS_VAR extern __declspec(dllimport)
-#  endif
-#else
-#  define GTKTYPEUTILS_VAR extern
-#endif
-
-/* urg */
-GTKTYPEUTILS_VAR GType GTK_TYPE_IDENTIFIER;
-
 #endif /* GTK_DISABLE_DEPRECATED */
 
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+/* deprecated, use g_type_init() instead */
+void           gtk_type_init   (GTypeDebugFlags debug_flags);
+#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
+
 G_END_DECLS
 
 #endif /* __GTK_TYPE_UTILS_H__ */