aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/ScintillaView.mm
diff options
context:
space:
mode:
authornyamatongwe <nyamatongwe@gmail.com>2013-01-30 11:19:56 +1100
committernyamatongwe <nyamatongwe@gmail.com>2013-01-30 11:19:56 +1100
commit241a606303ea56321dcd975beca3e49bb5f1ca1f (patch)
tree0739055d7a37bd8683698a2ff3424f7610d88970 /cocoa/ScintillaView.mm
parentb6b784c701a33c9ba11330a5fb1ecdc745abdb04 (diff)
downloadscintilla-mirror-241a606303ea56321dcd975beca3e49bb5f1ca1f.tar.gz
Type casts so will build in std=c++11 mode.
Diffstat (limited to 'cocoa/ScintillaView.mm')
-rw-r--r--cocoa/ScintillaView.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 5ab86ee80..542c51679 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -932,9 +932,9 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
int scrollerWidth = [NSScroller scrollerWidth];
NSSize size = [self frame].size;
- NSRect hScrollerRect = {0, 0, size.width, scrollerWidth};
- NSRect vScrollerRect = {size.width - scrollerWidth, 0, scrollerWidth, size.height};
- NSRect barFrame = {0, size.height - scrollerWidth, size.width, scrollerWidth};
+ NSRect hScrollerRect = {0, 0, size.width, static_cast<CGFloat>(scrollerWidth)};
+ NSRect vScrollerRect = {size.width - scrollerWidth, 0, static_cast<CGFloat>(scrollerWidth), size.height};
+ NSRect barFrame = {0, size.height - scrollerWidth, size.width, static_cast<CGFloat>(scrollerWidth)};
BOOL infoBarVisible = mInfoBar != nil && ![mInfoBar isHidden];
// Horizontal offset of the content. Almost always 0 unless the vertical scroller
@@ -1009,7 +1009,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa
}
}
- NSRect contentRect = {contentX, vScrollerRect.origin.y, size.width, size.height};
+ NSRect contentRect = {static_cast<CGFloat>(contentX), vScrollerRect.origin.y, size.width, size.height};
[mContent setFrame: contentRect];
if (infoBarVisible)