X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28cc717d5a48c229d8d09ef9ece751949074ae5d..16ec1954b1ccbb9bcce68bb6a248e97393c5825c:/wxPython/src/helpers.cpp?ds=sidebyside

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 9c983e008b..e7326368ce 100644
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -495,6 +495,8 @@ void wxPyApp::_BootstrapApp()
         Py_DECREF(argTuple);
         Py_DECREF(method);
         if (retval == NULL)
+            // Don't PyErr_Print here, let the exception in this case go back
+            // up to the wx.PyApp.__init__ scope.
             goto error;
 
         pyint = PyNumber_Int(retval);
@@ -713,7 +715,19 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
     _AddInfoString("wx-assertions-off");
 #endif
     _AddInfoString(wxPy_SWIG_VERSION);    
-    
+#ifdef __WXMAC__
+    #if wxMAC_USE_CORE_GRAPHICS
+        _AddInfoString("mac-cg");
+    #else
+        _AddInfoString("mac-qd");
+    #endif
+    #if wxMAC_USE_NATIVE_TOOLBAR
+        _AddInfoString("mac-native-tb");
+    #else
+        _AddInfoString("mac-no-native-tb");
+    #endif
+#endif
+        
 #undef _AddInfoString
 
     PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo);