[gdl] Deprecate GDL_DOCK_OBJECT_FROZEN
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdl] Deprecate GDL_DOCK_OBJECT_FROZEN
- Date: Fri, 3 Aug 2012 17:14:53 +0000 (UTC)
commit fc1bef4a6938c8f91a55c0e06572653a2f47b16f
Author: SÃbastien Granjoux <seb sfo free fr>
Date: Fri Aug 3 14:38:25 2012 +0200
Deprecate GDL_DOCK_OBJECT_FROZEN
gdl/gdl-dock-object.c | 24 ++++++++++++++++++++++--
gdl/gdl-dock-object.h | 5 +++++
2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/gdl/gdl-dock-object.c b/gdl/gdl-dock-object.c
index 38e32ee..530d399 100644
--- a/gdl/gdl-dock-object.c
+++ b/gdl/gdl-dock-object.c
@@ -627,7 +627,8 @@ gdl_dock_object_get_parent_object (GdlDockObject *object)
* @object: A #GdlDockObject
*
* Temporarily freezes a dock object, any call to reduce on the object has no
- * immediate effect.
+ * immediate effect. If gdl_dock_object_freeze() has been called more than once,
+ * gdl_dock_object_thaw() must be called an equal number of times.
*/
void
gdl_dock_object_freeze (GdlDockObject *object)
@@ -666,6 +667,25 @@ gdl_dock_object_thaw (GdlDockObject *object)
}
/**
+ * gdl_dock_object_is_frozen:
+ * @object: A #GdlDockObject
+ *
+ * Determine if an object is frozen and is not removed immediately from the
+ * widget hierarchy when it is reduced.
+ *
+ * Return value: %TRUE if the object is frozen.
+ *
+ * Since: 3.6
+ */
+gboolean
+gdl_dock_object_is_frozen (GdlDockObject *object)
+{
+ g_return_val_if_fail (GDL_IS_DOCK_OBJECT (object), FALSE);
+
+ return object->freeze_count > 0;
+}
+
+/**
* gdl_dock_object_reduce:
* @object: A #GdlDockObject
*
@@ -677,7 +697,7 @@ gdl_dock_object_reduce (GdlDockObject *object)
{
g_return_if_fail (object != NULL);
- if (GDL_DOCK_OBJECT_FROZEN (object)) {
+ if (gdl_dock_object_is_frozen (object)) {
object->reduce_pending = TRUE;
return;
}
diff --git a/gdl/gdl-dock-object.h b/gdl/gdl-dock-object.h
index 6067285..1f97f06 100644
--- a/gdl/gdl-dock-object.h
+++ b/gdl/gdl-dock-object.h
@@ -250,13 +250,17 @@ struct _GdlDockObjectClass {
#define GDL_DOCK_OBJECT_UNSET_FLAGS(obj,flag) \
G_STMT_START { (GDL_DOCK_OBJECT_FLAGS (obj) &= ~(flag)); } G_STMT_END
+#ifndef GDL_DISABLE_DEPRECATED
/**
* GDL_DOCK_OBJECT_FROZEN:
* @obj: A #GdlDockObject
*
* Evaluates to %TRUE if the object is frozen.
+ *
+ * Deprecated: 3.6: Use gdl_dock_object_is_frozen()
*/
#define GDL_DOCK_OBJECT_FROZEN(obj) (GDL_DOCK_OBJECT (obj)->freeze_count > 0)
+#endif
/* public interface */
@@ -272,6 +276,7 @@ GdlDockObject *gdl_dock_object_get_parent_object (GdlDockObject *object);
void gdl_dock_object_freeze (GdlDockObject *object);
void gdl_dock_object_thaw (GdlDockObject *object);
+gboolean gdl_dock_object_is_frozen (GdlDockObject *object);
void gdl_dock_object_reduce (GdlDockObject *object);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]