diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2015-02-14 09:15:28 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2015-02-14 09:15:28 +1100 |
| commit | a2f8fd71a1c55e7b8e66f9f299dcdfdafe5d7d6e (patch) | |
| tree | f8f6a545576a759eed8b237d9f83d43db2da0e6f /cocoa/ScintillaCocoa.mm | |
| parent | 6e04043eadf5cccff1c6f6c3ac20c25df43425ae (diff) | |
| download | scintilla-mirror-a2f8fd71a1c55e7b8e66f9f299dcdfdafe5d7d6e.tar.gz | |
Fix 64->32 bit conversion warnings.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 5f5d68b73..d2d9c0f5a 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1023,7 +1023,7 @@ void ScintillaCocoa::Paste(bool forceRectangular) pdoc->BeginUndoAction(); ClearSelection(false); - InsertPasteShape(selectedText.Data(), selectedText.Length(), + InsertPasteShape(selectedText.Data(), static_cast<int>(selectedText.Length()), selectedText.rectangular ? pasteRectangular : pasteStream); pdoc->EndUndoAction(); @@ -2241,7 +2241,7 @@ void ScintillaCocoa::ShowFindIndicatorForRange(NSRange charRange, BOOL retaining CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(), vs.styles[STYLE_DEFAULT].characterSet); std::vector<char> buffer(charRange.length); - pdoc->GetCharRange(&buffer[0], charRange.location, charRange.length); + pdoc->GetCharRange(&buffer[0], static_cast<int>(charRange.location), static_cast<int>(charRange.length)); CFStringRef cfsFind = CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(&buffer[0]), @@ -2250,8 +2250,8 @@ void ScintillaCocoa::ShowFindIndicatorForRange(NSRange charRange, BOOL retaining if (cfsFind) CFRelease(cfsFind); layerFindIndicator.retaining = retaining; - layerFindIndicator.positionFind = charRange.location; - int style = WndProc(SCI_GETSTYLEAT, charRange.location, 0); + layerFindIndicator.positionFind = static_cast<int>(charRange.location); + long style = WndProc(SCI_GETSTYLEAT, charRange.location, 0); std::vector<char> bufferFontName(WndProc(SCI_STYLEGETFONT, style, 0) + 1); WndProc(SCI_STYLEGETFONT, style, (sptr_t)&bufferFontName[0]); layerFindIndicator.sFont = [NSString stringWithUTF8String: &bufferFontName[0]]; |