Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 19 Mar 2013 13:58:50 UTC Commit: b7485c19259fe90b5c2c9ed2245ab3d65af34682 https://github.com/geany/geany/commit/b7485c19259fe90b5c2c9ed2245ab3d65af346...

Log Message: ----------- Merge "Improve GTK compatibility macros for GTK 2.16" from eht16/master

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

Modified: src/gtkcompat.h 12 files changed, 10 insertions(+), 2 deletions(-) =================================================================== @@ -72,14 +72,22 @@

/* GtkWidget */ #if ! GTK_CHECK_VERSION(2, 18, 0) -# define compat_widget_set_flag(widget, flag, enable) \ - ((enable) ? GTK_WIDGET_SET_FLAGS((widget), (flag)) : 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) # define gtk_widget_is_sensitive(widget) GTK_WIDGET_IS_SENSITIVE(widget) # define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS(widget) # define gtk_widget_get_sensitive(widget) GTK_WIDGET_SENSITIVE(widget) +# define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE(widget) # define gtk_widget_set_has_window(widget, has_window) \ compat_widget_set_flag((widget), GTK_NO_WINDOW, !(has_window)) # define gtk_widget_set_can_focus(widget, can_focus) \

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