Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f1b64ad

Browse filesBrowse files
authored
Merge pull request matplotlib#11850 from jklymak/fix-macosx-framwork-check
FIX: macosx framework check
2 parents 799ab40 + db64c09 commit f1b64ad
Copy full SHA for f1b64ad

File tree

Expand file treeCollapse file tree

1 file changed

+2
-14
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-14
lines changed

‎src/_macosx.m

Copy file name to clipboardExpand all lines: src/_macosx.m
+2-14Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,24 +2565,12 @@ static void context_cleanup(const void* info)
25652565

25662566
static bool verify_framework(void)
25672567
{
2568-
#ifdef COMPILING_FOR_10_6
2569-
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
2570-
NSRunningApplication* app = [NSRunningApplication currentApplication];
2571-
NSApplicationActivationPolicy activationPolicy = [app activationPolicy];
2572-
[pool release];
2573-
switch (activationPolicy) {
2574-
case NSApplicationActivationPolicyRegular:
2575-
case NSApplicationActivationPolicyAccessory:
2576-
return true;
2577-
case NSApplicationActivationPolicyProhibited:
2578-
break;
2579-
}
2580-
#else
25812568
ProcessSerialNumber psn;
2569+
/* These methods are deprecated, but they don't require the app to
2570+
have started */
25822571
if (CGMainDisplayID()!=0
25832572
&& GetCurrentProcess(&psn)==noErr
25842573
&& SetFrontProcess(&psn)==noErr) return true;
2585-
#endif
25862574
PyErr_SetString(PyExc_ImportError,
25872575
"Python is not installed as a framework. The Mac OS X backend will "
25882576
"not be able to function correctly if Python is not installed as a "

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.