diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/ExternalLexer.cxx | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win32/ExternalLexer.cxx b/win32/ExternalLexer.cxx index b93cca8f4..593bb315a 100644 --- a/win32/ExternalLexer.cxx +++ b/win32/ExternalLexer.cxx @@ -230,7 +230,7 @@ void LexerManager::EnumerateLexers() { int i = FindLastSlash(path); if (i == -1) - i = strlen(path); + i = static_cast<int>(strlen(path)); SString sPath(path, 0, i); diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 9cf7ac991..184bfb2bc 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -174,7 +174,7 @@ class ScintillaWin : HWND hWnd, UINT iMessage, WPARAM wParam, sptr_t lParam); virtual void StartDrag(); - sptr_t WndPaint(unsigned long wParam); + sptr_t WndPaint(uptr_t wParam); sptr_t HandleComposition(uptr_t wParam, sptr_t lParam); virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); @@ -356,14 +356,14 @@ static int KeyTranslate(int keyIn) { } } -LRESULT ScintillaWin::WndPaint(unsigned long wParam) { +LRESULT ScintillaWin::WndPaint(uptr_t wParam) { //ElapsedTime et; // Redirect assertions to debug output and save current state bool assertsPopup = Platform::ShowAssertionPopUps(false); paintState = painting; PAINTSTRUCT ps; - PAINTSTRUCT* pps; + PAINTSTRUCT *pps; bool IsOcxCtrl = (wParam != 0); // if wParam != 0, it contains // a PAINSTRUCT* from the OCX @@ -677,7 +677,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam break; case WM_PALETTECHANGED: - if (wParam != reinterpret_cast<unsigned int>(MainHWND())) { + if (wParam != reinterpret_cast<uptr_t>(MainHWND())) { //Platform::DebugPrintf("** Palette Changed\n"); RealizeWindowPalette(true); } @@ -838,7 +838,7 @@ void ScintillaWin::SetTicking(bool on) { if (timer.ticking) { timer.tickerID = reinterpret_cast<TickerID>(::SetTimer(MainHWND(), 1, timer.tickSize, NULL)); } else { - ::KillTimer(MainHWND(), reinterpret_cast<UINT>(timer.tickerID)); + ::KillTimer(MainHWND(), reinterpret_cast<uptr_t>(timer.tickerID)); timer.tickerID = 0; } } |