Commit2286a32

authored

Merge pull request#18067 from meeseeksmachine/auto-backport-of-pr-17956-on-v3.3.x

Backport PR#17956 on branch v3.3.x (ENH: Add version check for mac sdk version)

2 parentsdaf999e +5d5a550 commit2286a32Copy full SHA for 2286a32

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -652,6 +652,7 @@ def get_extensions(self):`
`652`	`652`	`'src/_macosx.m'`
`653`	`653`	`]`
`654`	`654`	`ext=Extension('matplotlib.backends._macosx',sources)`
	`655`	`+ext.extra_compile_args.extend(['-Werror=unguarded-availability'])`
`655`	`656`	`ext.extra_link_args.extend(['-framework','Cocoa'])`
`656`	`657`	`ifplatform.python_implementation().lower()=='pypy':`
`657`	`658`	`ext.extra_compile_args.append('-DPYPY=1')`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1207,8 +1207,10 @@ -(void)save_figure:(id)sender`
`1207`	`1207`	`rect.size.height =0;`
`1208`	`1208`	`rect.origin.x += height;`
`1209`	`1209`	`NSTextView* messagebox = [[NSTextViewalloc]initWithFrame: rect];`
`1210`		`- messagebox.textContainer.maximumNumberOfLines =2;`
`1211`		`- messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;`
	`1210`	`+if (@available(macOS10.11, *)) {`
	`1211`	`+ messagebox.textContainer.maximumNumberOfLines =2;`
	`1212`	`+ messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;`
	`1213`	`+ }`
`1212`	`1214`	`[messageboxsetFont: font];`
`1213`	`1215`	`[messageboxsetDrawsBackground:NO];`
`1214`	`1216`	`[messageboxsetSelectable:NO];`

Comments

(0)