[geany/geany] 9d4127: Make the compat_widget_set_flag macro more robust

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Tue, 19 Mar 2013 13:43:12 UTC
Commit:      9d412702e8c26e3ce7cc16445d292be003eb3a5f
             https://github.com/geany/geany/commit/9d412702e8c26e3ce7cc16445d292be003eb3a5f

Log Message:
-----------
Make the compat_widget_set_flag macro more robust


Modified Paths:
--------------
    src/gtkcompat.h

Modified: src/gtkcompat.h
14 files changed, 9 insertions(+), 5 deletions(-)
===================================================================
@@ -72,11 +72,15 @@
 
 /* GtkWidget */
 #if ! GTK_CHECK_VERSION(2, 18, 0)
-#	define compat_widget_set_flag(widget, flag, enable) \
-		if ((enable)) \
-			GTK_WIDGET_SET_FLAGS((widget), (flag)); \
-		else \
-			GTK_WIDGET_UNSET_FLAGS((widget), (flag));
+#  define compat_widget_set_flag(widget, flag, enable) \
+    do { \
+        GtkWidget *set_flag__widget = (widget); \
+        GtkWidgetFlags set_flag__flag = (flag); \
+        if (enable) \
+            GTK_WIDGET_SET_FLAGS(set_flag__widget, set_flag__flag); \
+        else \
+            GTK_WIDGET_UNSET_FLAGS(set_flag__widget, set_flag__flag); \
+    } while (0)
 #	define gtk_widget_set_can_default(widget, can_default) \
 		compat_widget_set_flag((widget), GTK_CAN_DEFAULT, (can_default))
 #	define gtk_widget_is_toplevel(widget)		GTK_WIDGET_TOPLEVEL(widget)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).