* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * 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.
#include <glib-object.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
+#ifndef GTK_DISABLE_DEPRECATED
/* Fundamental Types
* 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_GTK_CHAR,
- GTK_TYPE_UCHAR = G_TYPE_GTK_UCHAR,
- GTK_TYPE_BOOL = G_TYPE_GTK_BOOL,
- GTK_TYPE_INT = G_TYPE_GTK_INT,
- GTK_TYPE_UINT = G_TYPE_GTK_UINT,
- GTK_TYPE_LONG = G_TYPE_GTK_LONG,
- GTK_TYPE_ULONG = G_TYPE_GTK_ULONG,
- GTK_TYPE_FLOAT = G_TYPE_GTK_FLOAT,
- GTK_TYPE_DOUBLE = G_TYPE_GTK_DOUBLE,
- GTK_TYPE_STRING = G_TYPE_GTK_STRING,
- GTK_TYPE_BOXED = G_TYPE_GTK_BOXED,
- GTK_TYPE_POINTER = G_TYPE_GTK_POINTER,
- GTK_TYPE_SIGNAL = G_TYPE_GTK_SIGNAL
-} 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)))
#define GTK_CLASS_TYPE(class) (G_TYPE_FROM_CLASS (class))
#define GTK_TYPE_IS_OBJECT(type) (g_type_is_a ((type), GTK_TYPE_OBJECT))
-
/* outdated macros that really shouldn't e used anymore,
* use the GLib type system instead
*/
-#ifndef GTK_DISABLE_COMPAT_H
#define GTK_TYPE_FUNDAMENTAL_LAST (G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1)
#define GTK_TYPE_FUNDAMENTAL_MAX (G_TYPE_FUNDAMENTAL_MAX)
-#endif /* GTK_DISABLE_COMPAT_H */
-/* glib macro wrappers (compatibility) */
+#define GTK_FUNDAMENTAL_TYPE G_TYPE_FUNDAMENTAL
#define GTK_STRUCT_OFFSET G_STRUCT_OFFSET
+
+#endif /* GTK_DISABLE_DEPRECATED */
+
+/* glib macro wrappers (compatibility) */
#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
#define GTK_CHECK_CLASS_CAST G_TYPE_CHECK_CLASS_CAST
#define GTK_CHECK_GET_CLASS G_TYPE_INSTANCE_GET_CLASS
#define GTK_CHECK_TYPE G_TYPE_CHECK_INSTANCE_TYPE
#define GTK_CHECK_CLASS_TYPE G_TYPE_CHECK_CLASS_TYPE
-#define GTK_FUNDAMENTAL_TYPE G_TYPE_FUNDAMENTAL
/* glib type wrappers (compatibility) */
+
typedef GType GtkType;
+
+#ifndef GTK_DISABLE_DEPRECATED
+
typedef GTypeInstance GtkTypeObject;
typedef GTypeClass GtkTypeClass;
typedef GBaseInitFunc GtkClassInitFunc;
typedef GInstanceInitFunc GtkObjectInitFunc;
+#endif /* GTK_DISABLE_DEPRECATED */
+
+G_END_DECLS
/* Builtin Types
*/
#include <gtk/gtktypebuiltins.h>
+G_BEGIN_DECLS
+
+/* urg */
+#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
+GType gtk_identifier_get_type (void);
/* --- typedefs --- */
/* here we come with some necessary forward declarations for structures and
*/
typedef struct _GtkArg GtkArg;
typedef struct _GtkObject GtkObject; /* object forward declaration */
-typedef struct _GtkTypeInfo GtkTypeInfo;
-typedef gint (*GtkFunction) (gpointer data);
+typedef gboolean (*GtkFunction) (gpointer data);
typedef void (*GtkDestroyNotify) (gpointer data);
typedef void (*GtkCallbackMarshal) (GtkObject *object,
gpointer data,
guint n_args,
GtkArg *args);
-typedef void (*GtkSignalFunc) ();
-typedef void (*GtkSignalMarshaller) (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
+typedef void (*GtkSignalFunc) (void);
#define GTK_SIGNAL_FUNC(f) ((GtkSignalFunc) (f))
+#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
/* argument value access macros, these must not contain casts,
* to allow the usage of these macros in combination with the
- * adress operator, e.g. >K_VALUE_CHAR (*arg)
+ * address operator, e.g. >K_VALUE_CHAR (*arg)
*/
#define GTK_VALUE_CHAR(a) ((a).d.char_data)
#define GTK_VALUE_UCHAR(a) ((a).d.uchar_data)
#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 */
-/* return location macros, these all narow down to
+#ifndef GTK_DISABLE_DEPRECATED
+/* return location macros, these all narrow down to
* pointer types, because return values need to be
* passed by reference
*/
gpointer reserved_2;
GtkClassInitFunc base_class_init_func;
};
-GtkType gtk_type_unique (GtkType parent_type,
- const GtkTypeInfo *gtkinfo);
-gpointer gtk_type_class (GtkType type);
-gpointer gtk_type_new (GtkType type);
+#endif /* GTK_DISABLE_DEPRECATED */
-/* --- initialize the type system --- */
-void gtk_type_init (void);
+gpointer gtk_type_class (GtkType type);
+#ifndef GTK_DISABLE_DEPRECATED
-/* --- compatibility defines --- */
-#define gtk_type_name g_type_name
-#define gtk_type_from_name g_type_from_name
-#define gtk_type_parent g_type_parent
-#define gtk_type_is_a g_type_is_a
+GtkType gtk_type_unique (GtkType parent_type,
+ const GtkTypeInfo *gtkinfo);
+gpointer gtk_type_new (GtkType type);
+/* --- compatibility defines --- */
+#define gtk_type_name(type) g_type_name (type)
+#define gtk_type_from_name(name) g_type_from_name (name)
+#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))
/* enum/flags compatibility functions, we strongly
* recommend to use the glib enum/flags classes directly
GtkFlagValue* gtk_type_flags_find_value (GtkType flags_type,
const gchar *value_name);
-/* urg */
-extern GType GTK_TYPE_IDENTIFIER;
-
+#endif /* GTK_DISABLE_DEPRECATED */
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#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__ */
projects / ~andy / gtk / blobdiff