X Tutup
Skip to content

Fix for issue4372 #4452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenshnielsen merged 4 commits into from
Jun 1, 2015
Merged

Fix for issue4372 #4452

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c44b4c2
Reintroduce the verify_main_display function to check during runtime …
May 21, 2015
0df8646
Merge branch 'master' of git://github.com/matplotlib/matplotlib into …
May 21, 2015
5607c24
Add a comment to explain the purpose of this function.
mdehoon May 24, 2015
46f2d53
Using Cocoa when available, using the older Carbon API otherwise.
mdehoon May 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions src/_macosx.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Copy link
Copy Markdown
Member

@jenshnielsen jenshnielsen May 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add a default case handling -1? I.e. when this is called without an NSApplication? Perhaps raising a warning that the check will not work? Alternatively I think that we should at least document that this will not work without an NSApplication

}
#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,
Expand Down Expand Up @@ -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();

Expand All @@ -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;
Expand Down Expand Up @@ -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
}
X Tutup