[gtk+] Remove GtkArg, GtkCallbackMarshal and GtkFunction
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Remove GtkArg, GtkCallbackMarshal and GtkFunction
- Date: Tue, 4 Jan 2011 19:52:00 +0000 (UTC)
commit 1283368b1bc93f6190d9aca92c433def60e73c55
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jan 4 13:49:37 2011 -0500
Remove GtkArg, GtkCallbackMarshal and GtkFunction
Based on a patch by Javier Jardón.
https://bugzilla.gnome.org/show_bug.cgi?id=629955
docs/reference/gtk/gtk3-sections.txt | 5 --
gtk/gtktypeutils.h | 80 ----------------------------------
2 files changed, 0 insertions(+), 85 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index b5b947e..9b56551 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -5317,11 +5317,6 @@ gtk_device_grab_add
gtk_device_grab_remove
<SUBSECTION>
-GtkFunction
-GtkCallbackMarshal
-GtkArg
-
-<SUBSECTION>
GTK_PRIORITY_RESIZE
<SUBSECTION>
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 15c749d..91ef217 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -41,86 +41,6 @@ G_BEGIN_DECLS
#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
GType gtk_identifier_get_type (void) G_GNUC_CONST;
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* --- typedefs --- */
-/* here we come with some necessary forward declarations for structures and
- * provide some fundamental function signatures
- */
-typedef struct _GtkArg GtkArg;
-
-/**
- * GtkFunction:
- * @data: #gpointer
- *
- * Defines a function pointer.
- *
- * Returns: #gint
- *
- * Deprecated: 2.24: Use GSourceFunc() instead.
- */
-typedef gboolean (*GtkFunction) (gpointer data);
-
-/**
- * GtkCallbackMarshal:
- * @object: #GObject*
- * @data: #gpointer
- * @n_args: #guint
- * @args: #GtkArg*
- *
- * Defines a function pointer.
- *
- * Deprecated: 2.24:
- */
-typedef void (*GtkCallbackMarshal) (GObject *object,
- gpointer data,
- guint n_args,
- GtkArg *args);
-
-/**
- * GtkArg:
- *
- * This is a structure that we use to pass in typed values (and names).
- *
- * Deprecated: 2.2:
- */
-struct _GtkArg
-{
- GType type;
- gchar *name;
-
- /* this union only defines the required storage types for
- * the possibile values, thus there is no gint enum_data field,
- * because that would just be a mere alias for gint int_data.
- * use the GTK_VALUE_*() and GTK_RETLOC_*() macros to access
- * the discrete memebers.
- */
- union {
- /* flat values */
- gchar char_data;
- guchar uchar_data;
- gboolean bool_data;
- gint int_data;
- guint uint_data;
- glong long_data;
- gulong ulong_data;
- gfloat float_data;
- gdouble double_data;
- gchar *string_data;
- GObject *object_data;
- gpointer pointer_data;
-
- /* structured values */
- struct {
- GCallback f;
- gpointer d;
- } signal_data;
- } d;
-};
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* This used to be defined in gtkitemfactory.h, but moved over here after
- * the complete deprecation of that header
- */
typedef gchar * (*GtkTranslateFunc) (const gchar *path,
gpointer func_data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]