diff options
| author | nyamatongwe <devnull@localhost> | 2012-05-05 14:00:51 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2012-05-05 14:00:51 +1000 |
| commit | c14c913f0b6299878dd5bfd4e3e5079885427c2b (patch) | |
| tree | 5704184614beaacf22c65a1bc94fbdf7b466ab66 | |
| parent | ceb8fe2321abf6e61833864996d42a2e9486d14d (diff) | |
| download | scintilla-mirror-c14c913f0b6299878dd5bfd4e3e5079885427c2b.tar.gz | |
Add some casts to avoid narrowing warnings from g++ 4.7.
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index c32e07777..f0f5ee4c2 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -923,7 +923,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case WM_CHAR: if (((wParam >= 128) || !iscntrl(wParam)) || !lastKeyDownConsumed) { if (::IsWindowUnicode(MainHWND()) || keysAlwaysUnicode) { - wchar_t wcs[2] = {wParam, 0}; + wchar_t wcs[2] = {static_cast<wchar_t>(wParam), 0}; if (IsUnicodeMode()) { // For a wide character version of the window: char utfval[4]; @@ -1043,7 +1043,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam if ((pt.x == -1) && (pt.y == -1)) { // Caused by keyboard so display menu near caret pt = PointMainCaret(); - POINT spt = {pt.x, pt.y}; + POINT spt = {static_cast<int>(pt.x), static_cast<int>(pt.y)}; ::ClientToScreen(MainHWND(), &spt); pt = Point(spt.x, spt.y); } |