diff options
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 3d4a0f622..4f4fa1b71 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -726,7 +726,7 @@ SCIContentView *ScintillaCocoa::ContentView() { Scintilla::Internal::Point ScintillaCocoa::GetVisibleOriginInMain() const { NSScrollView *scrollView = ScrollContainer(); NSRect contentRect = scrollView.contentView.bounds; - return Point(static_cast<XYPOSITION>(contentRect.origin.x), static_cast<XYPOSITION>(contentRect.origin.y)); + return Point(contentRect.origin.x, contentRect.origin.y); } //-------------------------------------------------------------------------------------------------- @@ -740,8 +740,7 @@ PRectangle ScintillaCocoa::GetClientRectangle() const { NSScrollView *scrollView = ScrollContainer(); NSSize size = scrollView.contentView.bounds.size; Point origin = GetVisibleOriginInMain(); - return PRectangle(origin.x, origin.y, static_cast<XYPOSITION>(origin.x+size.width), - static_cast<XYPOSITION>(origin.y + size.height)); + return PRectangle(origin.x, origin.y, origin.x+size.width, origin.y + size.height); } //-------------------------------------------------------------------------------------------------- @@ -772,7 +771,7 @@ Scintilla::Internal::Point ScintillaCocoa::ConvertPoint(NSPoint point) { NSView *container = ContentView(); NSPoint result = [container convertPoint: point fromView: nil]; Scintilla::Internal::Point ptOrigin = GetVisibleOriginInMain(); - return Point(static_cast<XYPOSITION>(result.x - ptOrigin.x), static_cast<XYPOSITION>(result.y - ptOrigin.y)); + return Point(result.x - ptOrigin.x, result.y - ptOrigin.y); } //-------------------------------------------------------------------------------------------------- @@ -1168,8 +1167,7 @@ void ScintillaCocoa::CTPaint(void *gc, NSRect rc) { void ScintillaCocoa::CallTipMouseDown(NSPoint pt) { NSRect rectBounds = ((__bridge NSView *)(ct.wDraw.GetID())).bounds; - Point location(static_cast<XYPOSITION>(pt.x), - static_cast<XYPOSITION>(rectBounds.size.height - pt.y)); + Point location(pt.x, rectBounds.size.height - pt.y); ct.MouseClick(location); CallTipClick(); } |