diff options
| author | Neil <nyamatongwe@gmail.com> | 2015-07-04 11:03:56 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2015-07-04 11:03:56 +1000 |
| commit | 1a849d8a77068fbabb253b45a28ffc130806e879 (patch) | |
| tree | 1c0352573234255476f087b38205784c23265e9d | |
| parent | e767f21c8ce6bb5c6291fd501562b8392c93ce70 (diff) | |
| download | scintilla-mirror-1a849d8a77068fbabb253b45a28ffc130806e879.tar.gz | |
Closer correspondence between return type of *WndProc and Win32 definition.
Avoids potential problems if sptr_t changed to a slightly different type.
| -rw-r--r-- | win32/ScintillaWin.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index d9a1c88a0..d5c5f9e89 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -235,10 +235,10 @@ class ScintillaWin : static sptr_t DirectFunction( sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam); - static sptr_t PASCAL SWndProc( - HWND hWnd, UINT iMessage, WPARAM wParam, sptr_t lParam); - static sptr_t PASCAL CTWndProc( - HWND hWnd, UINT iMessage, WPARAM wParam, sptr_t lParam); + static LRESULT PASCAL SWndProc( + HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam); + static LRESULT PASCAL CTWndProc( + HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam); enum { invalidTimerID, standardTimerID, idleTimerID, fineTimerStart }; @@ -704,7 +704,7 @@ int ScintillaWin::EncodedFromUTF8(char *utf8, char *encoded) const { } } -LRESULT ScintillaWin::WndPaint(uptr_t wParam) { +sptr_t ScintillaWin::WndPaint(uptr_t wParam) { //ElapsedTime et; // Redirect assertions to debug output and save current state @@ -3128,8 +3128,8 @@ BOOL ScintillaWin::DestroySystemCaret() { return retval; } -sptr_t PASCAL ScintillaWin::CTWndProc( - HWND hWnd, UINT iMessage, WPARAM wParam, sptr_t lParam) { +LRESULT PASCAL ScintillaWin::CTWndProc( + HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) { // Find C++ object associated with window. ScintillaWin *sciThis = reinterpret_cast<ScintillaWin *>(PointerFromWindow(hWnd)); try { @@ -3246,8 +3246,8 @@ sptr_t __stdcall Scintilla_DirectFunction( return sci->WndProc(iMessage, wParam, lParam); } -sptr_t PASCAL ScintillaWin::SWndProc( - HWND hWnd, UINT iMessage, WPARAM wParam, sptr_t lParam) { +LRESULT PASCAL ScintillaWin::SWndProc( + HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) { //Platform::DebugPrintf("S W:%x M:%x WP:%x L:%x\n", hWnd, iMessage, wParam, lParam); // Find C++ object associated with window. |