From 71da9bea83efd636fdcfc29b25fad675b82fecb8 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 30 May 2012 06:37:38 +0000
Subject: [PATCH] Don't do a #ifdef inside a macro expansion, MSVC doesn't like
 it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/app_ex.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app_ex.cpp b/src/app_ex.cpp
index 8f41ae23..c24bc464 100644
--- a/src/app_ex.cpp
+++ b/src/app_ex.cpp
@@ -231,7 +231,8 @@ void wxPyApp::_BootstrapApp()
         // wxApp takes ownership of the argv array, don't delete it here
 
         if (! result)  {
-            wxPyErr_SetString(PyExc_SystemError,
+            wxPyThreadBlocker blocker;
+            PyErr_SetString(PyExc_SystemError,
                               "wxEntryStart failed, unable to initialize wxWidgets!"
 #ifdef __WXGTK__
                               "  (Is DISPLAY set properly?)"