[gtk+] size request: Redo the recursion checks
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] size request: Redo the recursion checks
- Date: Wed, 9 Sep 2015 10:33:44 +0000 (UTC)
commit bf9a72976fed44d7ffc074896c8e948d975e94b6
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Sep 8 21:06:38 2015 -0400
size request: Redo the recursion checks
Use G_ENABLE_CONSISTENCY checks for the recursion checks
in gtksizerequest.c
gtk/gtksizerequest.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c
index dc075cd..8fe24cb 100644
--- a/gtk/gtksizerequest.c
+++ b/gtk/gtksizerequest.c
@@ -32,16 +32,14 @@
#include "deprecated/gtkstyle.h"
-#ifndef G_DISABLE_CHECKS
+#ifdef G_ENABLE_CONSISTENCY_CHECKS
static GQuark recursion_check_quark = 0;
-#endif /* G_DISABLE_CHECKS */
static void
push_recursion_check (GtkWidget *widget,
GtkOrientation orientation,
gint for_size)
{
-#ifndef G_DISABLE_CHECKS
const char *previous_method;
const char *method;
@@ -71,17 +69,18 @@ push_recursion_check (GtkWidget *widget,
}
g_object_set_qdata (G_OBJECT (widget), recursion_check_quark, (char*) method);
-#endif /* G_DISABLE_CHECKS */
}
static void
pop_recursion_check (GtkWidget *widget,
GtkOrientation orientation)
{
-#ifndef G_DISABLE_CHECKS
g_object_set_qdata (G_OBJECT (widget), recursion_check_quark, NULL);
-#endif
}
+#else
+#define push_recursion_check(widget, orientation, for_size)
+#define pop_recursion_check(widget, orientation)
+#endif /* G_ENABLE_CONSISTENCY_CHECKS */
static const char *
get_vfunc_name (GtkOrientation orientation,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]