Commit e0969a13 authored by Christian Dywan's avatar Christian Dywan Committed by Javier Jardón

Remove GtkObject floating, weak, arg and user data handling

parent 729d4c36
......@@ -294,7 +294,6 @@ gtk_spin_button_update_policy_get_type G_GNUC_CONST
gtk_notebook_tab_get_type G_GNUC_CONST
gtk_number_up_layout_get_type G_GNUC_CONST
gtk_anchor_type_get_type G_GNUC_CONST
gtk_arg_flags_get_type G_GNUC_CONST
gtk_arrow_type_get_type G_GNUC_CONST
gtk_arrow_placement_get_type G_GNUC_CONST
gtk_assistant_page_type_get_type G_GNUC_CONST
......@@ -2218,29 +2217,6 @@ gtk_notebook_set_action_widget
#if IN_HEADER(__GTK_OBJECT_H__)
#if IN_FILE(__GTK_OBJECT_C__)
#ifndef GTK_DISABLE_DEPRECATED
gtk_object_add_arg_type
gtk_object_get G_GNUC_NULL_TERMINATED
gtk_object_set G_GNUC_NULL_TERMINATED
gtk_object_get_data
gtk_object_get_data_by_id
gtk_object_get_user_data
gtk_object_new
gtk_object_remove_data
gtk_object_remove_data_by_id
gtk_object_remove_no_notify
gtk_object_remove_no_notify_by_id
gtk_object_ref
gtk_object_unref
gtk_object_weakref
gtk_object_weakunref
gtk_object_set_data
gtk_object_set_data_by_id
gtk_object_set_data_by_id_full
gtk_object_set_data_full
gtk_object_set_user_data
gtk_object_sink
#endif
gtk_object_destroy
gtk_object_get_type G_GNUC_CONST
#endif
......
This diff is collapsed.
......@@ -82,9 +82,6 @@ G_BEGIN_DECLS
typedef enum
{
GTK_IN_DESTRUCTION = 1 << 0, /* Used internally during dispose */
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
GTK_FLOATING = 1 << 1,
#endif
GTK_RESERVED_1 = 1 << 2,
GTK_RESERVED_2 = 1 << 3
} GtkObjectFlags;
......@@ -92,9 +89,6 @@ typedef enum
/* Macros for extracting the object_flags from GtkObject.
*/
#define GTK_OBJECT_FLAGS(obj) (GTK_OBJECT (obj)->flags)
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_OBJECT_FLOATING(obj) (g_object_is_floating (obj))
#endif
/* Macros for setting and clearing bits in the object_flags field of GtkObject.
*/
......@@ -120,14 +114,6 @@ struct _GtkObjectClass
{
GInitiallyUnownedClass parent_class;
/* Non overridable class methods to set and get per class arguments */
void (*set_arg) (GtkObject *object,
GtkArg *arg,
guint arg_id);
void (*get_arg) (GtkObject *object,
GtkArg *arg,
guint arg_id);
/* Default signal handler for the ::destroy signal, which is
* invoked to request that references to the widget be dropped.
* If an object class overrides destroy() in order to perform class
......@@ -139,112 +125,12 @@ struct _GtkObjectClass
void (*destroy) (GtkObject *object);
};
/* Application-level methods */
GType gtk_object_get_type (void) G_GNUC_CONST;
#ifndef GTK_DISABLE_DEPRECATED
void gtk_object_sink (GtkObject *object);
#endif
void gtk_object_destroy (GtkObject *object);
/****************************************************************/
#ifndef GTK_DISABLE_DEPRECATED
GtkObject* gtk_object_new (GType type,
const gchar *first_property_name,
...);
GtkObject* gtk_object_ref (GtkObject *object);
void gtk_object_unref (GtkObject *object);
void gtk_object_weakref (GtkObject *object,
GDestroyNotify notify,
gpointer data);
void gtk_object_weakunref (GtkObject *object,
GDestroyNotify notify,
gpointer data);
/* Set 'data' to the "object_data" field of the object. The
* data is indexed by the "key". If there is already data
* associated with "key" then the new data will replace it.
* If 'data' is NULL then this call is equivalent to
* 'gtk_object_remove_data'.
* The gtk_object_set_data_full variant acts just the same,
* but takes an additional argument which is a function to
* be called when the data is removed.
* `gtk_object_remove_data' is equivalent to the above,
* where 'data' is NULL
* `gtk_object_get_data' gets the data associated with "key".
*/
void gtk_object_set_data (GtkObject *object,
const gchar *key,
gpointer data);
void gtk_object_set_data_full (GtkObject *object,
const gchar *key,
gpointer data,
GDestroyNotify destroy);
void gtk_object_remove_data (GtkObject *object,
const gchar *key);
gpointer gtk_object_get_data (GtkObject *object,
const gchar *key);
void gtk_object_remove_no_notify (GtkObject *object,
const gchar *key);
/* Set/get the "user_data" object data field of "object". It should
* be noted that these functions are no different than calling
* `gtk_object_set_data'/`gtk_object_get_data' with a key of "user_data".
* They are merely provided as a convenience.
*/
void gtk_object_set_user_data (GtkObject *object,
gpointer data);
gpointer gtk_object_get_user_data (GtkObject *object);
/* Object-level methods */
/* Object data method variants that operate on key ids. */
void gtk_object_set_data_by_id (GtkObject *object,
GQuark data_id,
gpointer data);
void gtk_object_set_data_by_id_full (GtkObject *object,
GQuark data_id,
gpointer data,
GDestroyNotify destroy);
gpointer gtk_object_get_data_by_id (GtkObject *object,
GQuark data_id);
void gtk_object_remove_data_by_id (GtkObject *object,
GQuark data_id);
void gtk_object_remove_no_notify_by_id (GtkObject *object,
GQuark key_id);
#define gtk_object_data_try_key g_quark_try_string
#define gtk_object_data_force_id g_quark_from_string
/* GtkArg flag bits for gtk_object_add_arg_type
*/
typedef enum
{
GTK_ARG_READABLE = G_PARAM_READABLE,
GTK_ARG_WRITABLE = G_PARAM_WRITABLE,
GTK_ARG_CONSTRUCT = G_PARAM_CONSTRUCT,
GTK_ARG_CONSTRUCT_ONLY = G_PARAM_CONSTRUCT_ONLY,
GTK_ARG_CHILD_ARG = 1 << 4
} GtkArgFlags;
#define GTK_ARG_READWRITE (GTK_ARG_READABLE | GTK_ARG_WRITABLE)
void gtk_object_get (GtkObject *object,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
void gtk_object_set (GtkObject *object,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
void gtk_object_add_arg_type (const gchar *arg_name,
GType arg_type,
guint arg_flags,
guint arg_id);
#endif /* GTK_DISABLE_DEPRECATED */
G_END_DECLS
#endif /* __GTK_OBJECT_H__ */
......@@ -32,28 +32,16 @@ floating_tests (void)
GtkWidget *widget = g_object_new (GTK_TYPE_LABEL, NULL);
g_object_connect (widget, "signal::destroy", destroy, NULL, NULL);
g_assert (GTK_OBJECT_FLOATING (widget));
g_assert (g_object_is_floating (widget));
GTK_OBJECT_UNSET_FLAGS (widget, GTK_FLOATING);
g_assert (!GTK_OBJECT_FLOATING (widget));
g_assert (!g_object_is_floating (widget));
GTK_OBJECT_SET_FLAGS (widget, GTK_FLOATING);
g_assert (GTK_OBJECT_FLOATING (widget));
g_assert (g_object_is_floating (widget));
g_object_ref_sink (widget);
g_assert (!GTK_OBJECT_FLOATING (widget));
g_assert (!g_object_is_floating (widget));
g_object_force_floating (G_OBJECT (widget));
g_assert (GTK_OBJECT_FLOATING (widget));
g_assert (g_object_is_floating (widget));
g_object_ref (widget);
gtk_object_sink (GTK_OBJECT (widget));
g_assert (!GTK_OBJECT_FLOATING (widget));
g_object_ref_sink (widget);
g_assert (!g_object_is_floating (widget));
g_assert (!destroyed);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment