diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2014-12-07 09:58:45 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2014-12-07 09:58:45 +1100 |
| commit | d1db597843009f3b7be35396a377ffec280dd5d0 (patch) | |
| tree | 00b0d5885fc02e700c30d4601ab0817724af4b5f /cocoa/PlatCocoa.mm | |
| parent | 421d7d33448edbc12b28f78cdc448c2fe4da2e20 (diff) | |
| download | scintilla-mirror-d1db597843009f3b7be35396a377ffec280dd5d0.tar.gz | |
Replace calls to deprecated methods with their current equivalents.
Diffstat (limited to 'cocoa/PlatCocoa.mm')
| -rw-r--r-- | cocoa/PlatCocoa.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 28fe4dd8b..facd18c34 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -1144,7 +1144,7 @@ PRectangle Window::GetPosition() NSView* view = reinterpret_cast<NSView*>(idWin); win = [view window]; rect = [view convertRect: [view bounds] toView: nil]; - rect.origin = [win convertBaseToScreen:rect.origin]; + rect = [win convertRectToScreen:rect]; } else { @@ -1177,7 +1177,7 @@ void Window::SetPosition(PRectangle rc) // Moves this view inside the parent view NSRect nsrc = NSMakeRect(rc.left, rc.bottom, rc.Width(), rc.Height()); NSView* view = reinterpret_cast<NSView*>(idWin); - nsrc.origin = [[view window] convertScreenToBase:nsrc.origin]; + nsrc = [[view window] convertRectFromScreen:nsrc]; [view setFrame: nsrc]; } else @@ -1672,7 +1672,8 @@ PRectangle ListBoxImpl::GetDesiredRect() if (Length() > rows) { [scroller setHasVerticalScroller:YES]; - rcDesired.right += [NSScroller scrollerWidth]; + rcDesired.right += [NSScroller scrollerWidthForControlSize:NSRegularControlSize + scrollerStyle:NSScrollerStyleLegacy]; } else { |