From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 2 Jul 2012 22:59:14 +0000 (+0000)
Subject: Fix wxGTK compilation with MSVC after GTK+ 3 changes.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c38373bd542fe5b38d24503f87392c9d998ae15e

Fix wxGTK compilation with MSVC after GTK+ 3 changes.

Don't use preprocessor conditions inside a macro invocation, MSVC doesn't
support this.

Closes #14448.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index ee5e1b09a4..36344c4139 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2086,12 +2086,14 @@ void wxWindowGTK::GTKHandleRealized()
     {
         // attaching to style changed signal after realization avoids initial
         // changes we don't care about
-        g_signal_connect(m_wxwindow,
+        const gchar *detailed_signal =
 #ifdef __WXGTK3__
-            "style_updated",
+            "style_updated";
 #else
-            "style_set",
+            "style_set";
 #endif
+        g_signal_connect(m_wxwindow,
+            detailed_signal,
             G_CALLBACK(style_updated), this);
     }
 }