aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--win32/ScintillaWin.cxx18
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.