Merge pull request #4452 from mdehoon/fixForIssue4372

jenshnielsen · jenshnielsen · commit 0a4fe6d0a01c · 2015-06-01T16:41:18.000+01:00
Fix for issue4372
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -3950,7 +3950,6 @@ static void _data_provider_release(void* info, const void* data, size_t size)
     rect.size.height = height;
     rect.size.width = width;
 
-    NSApp = [NSApplication sharedApplication];
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
     self->window = [self->window initWithContentRect: rect
                                          styleMask: NSTitledWindowMask
@@ -6208,6 +6207,33 @@ static void timer_callback(CFRunLoopTimerRef timer, void* info)
     Timer_new,                 /* tp_new */
 };
 
+static bool verify_framework(void)
+{
+#ifdef COMPILING_FOR_10_6
+    NSRunningApplication* app = [NSRunningApplication currentApplication];
+    NSApplicationActivationPolicy activationPolicy = [app activationPolicy];
+    switch (activationPolicy) {
+        case NSApplicationActivationPolicyRegular:
+        case NSApplicationActivationPolicyAccessory:
+            return true;
+        case NSApplicationActivationPolicyProhibited:
+            break;
+    }
+#else
+    ProcessSerialNumber psn;
+    if (CGMainDisplayID()!=0
+     && GetCurrentProcess(&psn)==noErr
+     && SetFrontProcess(&psn)==noErr) return true;
+#endif
+    PyErr_SetString(PyExc_RuntimeError,
+        "Python is not installed as a framework. The Mac OS X backend will "
+        "not be able to function correctly if Python is not installed as a "
+        "framework. See the Python documentation for more information on "
+        "installing Python as a framework on Mac OS X. Please either reinstall "
+        "Python as a framework, or try one of the other backends.");
+    return false;
+}
+
 static struct PyMethodDef methods[] = {
    {"show",
     (PyCFunction)show,
@@ -6248,7 +6274,6 @@ static void timer_callback(CFRunLoopTimerRef timer, void* info)
 void init_macosx(void)
 #endif
 {
-#ifdef WITH_NEXT_FRAMEWORK
     PyObject *module;
     import_array();
 
@@ -6264,6 +6289,15 @@ void init_macosx(void)
         return;
 #endif
 
+    NSApp = [NSApplication sharedApplication];
+
+    if (!verify_framework())
+#if PY3K
+        return NULL;
+#else
+        return;
+#endif
+
 #if PY3K
     module = PyModule_Create(&moduledef);
     if (module==NULL) return NULL;
@@ -6300,21 +6334,4 @@ void init_macosx(void)
 #if PY3K
     return module;
 #endif
-#else
-    /* WITH_NEXT_FRAMEWORK is not defined. This means that Python is not
-     * installed as a framework, and therefore the Mac OS X backend will
-     * not interact properly with the window manager.
-     */
-    PyErr_SetString(PyExc_RuntimeError,
-        "Python is not installed as a framework. The Mac OS X backend will "
-        "not be able to function correctly if Python is not installed as a "
-        "framework. See the Python documentation for more information on "
-        "installing Python as a framework on Mac OS X. Please either reinstall "
-        "Python as a framework, or try one of the other backends.");
-#if PY3K
-    return NULL;
-#else
-    return;
-#endif
-#endif
 }
