[gtk+] Revert "Deprecate GTK_OBJECT_FLAGS() and GtkObjectFlags enum"
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "Deprecate GTK_OBJECT_FLAGS() and GtkObjectFlags enum"
- Date: Thu, 27 May 2010 22:15:15 +0000 (UTC)
commit 25ec337a16f31d65add39431530309af14ebfb4d
Author: Javier Jardón <jjardon gnome org>
Date: Fri May 28 00:14:17 2010 +0200
Revert "Deprecate GTK_OBJECT_FLAGS() and GtkObjectFlags enum"
This reverts commit 72467ba2e6136c7a2c1754280dc8edff56b5bf3c.
gtk/gtkobject.h | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index d8339a0..34f34ed 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -51,7 +51,6 @@ G_BEGIN_DECLS
#define GTK_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OBJECT))
#define GTK_OBJECT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), GTK_TYPE_OBJECT, GtkObjectClass))
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
/* GtkObject only uses the first 4 bits of the flags field.
* Derived objects may use the remaining bits. Though this
* is a kinda nasty break up, it does make the size of
@@ -65,9 +64,6 @@ G_BEGIN_DECLS
* @GTK_RESERVED_2: reserved for future use
*
* Tells about the state of the object.
- *
- * Deprecated: 2.22: Do not re-use #GtkObject flags but use your own variable to
- * store flags.
*/
typedef enum
{
@@ -82,9 +78,6 @@ typedef enum
*
* Gets the #GtkObjectFlags for an object without directly
* accessing its members.
- *
- * Deprecated: 2.22: Do not re-use #GtkObject flags but use your own variable to
- * store flags.
*/
#define GTK_OBJECT_FLAGS(obj) (GTK_OBJECT (obj)->flags)
@@ -92,7 +85,6 @@ typedef enum
*/
#define GTK_OBJECT_SET_FLAGS(obj,flag) G_STMT_START{ (GTK_OBJECT_FLAGS (obj) |= (flag)); }G_STMT_END
#define GTK_OBJECT_UNSET_FLAGS(obj,flag) G_STMT_START{ (GTK_OBJECT_FLAGS (obj) &= ~(flag)); }G_STMT_END
-#endif
typedef struct _GtkObjectClass GtkObjectClass;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]