Commitf1b64ad

authored

Merge pull request#11850 from jklymak/fix-macosx-framwork-check

FIX: macosx framework check

2 parents799ab40 +db64c09 commitf1b64adCopy full SHA for f1b64ad

File tree

-14

lines changed

-14

lines changed

Lines changed: 2 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -2565,24 +2565,12 @@ static void context_cleanup(const void* info)`
`2565`	`2565`
`2566`	`2566`	`staticboolverify_framework(void)`
`2567`	`2567`	`{`
`2568`		`-#ifdef COMPILING_FOR_10_6`
`2569`		`-NSAutoreleasePool* pool = [[NSAutoreleasePoolalloc]init];`
`2570`		`-NSRunningApplication* app = [NSRunningApplicationcurrentApplication];`
`2571`		`-NSApplicationActivationPolicy activationPolicy = [appactivationPolicy];`
`2572`		`- [poolrelease];`
`2573`		`-switch (activationPolicy) {`
`2574`		`-case NSApplicationActivationPolicyRegular:`
`2575`		`-case NSApplicationActivationPolicyAccessory:`
`2576`		`-returntrue;`
`2577`		`-case NSApplicationActivationPolicyProhibited:`
`2578`		`-break;`
`2579`		`- }`
`2580`		`-#else`
`2581`	`2568`	`ProcessSerialNumber psn;`
	`2569`	`+/* These methods are deprecated, but they don't require the app to`
	`2570`	`+ have started*/`
`2582`	`2571`	`if (CGMainDisplayID()!=0`
`2583`	`2572`	`&&GetCurrentProcess(&psn)==noErr`
`2584`	`2573`	`&&SetFrontProcess(&psn)==noErr)returntrue;`
`2585`		`-#endif`
`2586`	`2574`	`PyErr_SetString(PyExc_ImportError,`
`2587`	`2575`	`"Python is not installed as a framework. The Mac OS X backend will"`
`2588`	`2576`	`"not be able to function correctly if Python is not installed as a"`

Comments

(0)