AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

size request: Redo the recursion checks

Browse Source 
Use G_ENABLE_CONSISTENCY checks for the recursion checks
in gtksizerequest.c
This commit is contained in:
Matthias Clasen 2015-09-08 21:06:38 -04:00
parent f114d9c824
commit bf9a72976f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtksizerequest.c
View File

@ -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,