8000 Fix for issue4372 by mdehoon · Pull Request #4452 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
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
merged 4 commits into from
Jun 1, 2015
Merged

Fix for issue4372 #4452

Changes from 1 commit
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 8000 load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a comment to explain the purpose of this function.
  • Loading branch information
@mdehoon
mdehoon committed May 24, 2015
commit 5607c24dd74417cdd8daaadb0524aae5c5d81c4c
8 changes: 8 additions & 0 deletions src/_macosx.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6211,6 +6211,14 @@ static void timer_callback(CFRunLoopTimerRef timer, void* info)

static PyObject*
verify_main_display(PyObject* self)
/* Python2 contains a WMAvailable function in the MacOS module to check
* if python can interact with the display. This function calls
* CGMainDisplayID, which will return 0 if no window manager is available,
* or if we don't have permission to talk to it; this will happen if Python
* is not installed as a framework.
* The MacOS module was removed from Python3, so we need to provide a way
* to call CGMainDisplayID ourselves.
*/
{
PyObject* result;
CGDirectDisplayID display = CGMainDisplayID();
Expand Down
0