Defining sptr_t and uptr_t to be integral types large enough to contain

pointers to allow portability to 64 bit platforms.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/Editor.cxx b/src/Editor.cxx
index 67d8ea856..2b759c96c 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -3200,7 +3200,7 @@ static bool ValidMargin(unsigned long wParam) {
 	return wParam < ViewStyle::margins;
 }
 
-long Editor::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
+sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	//Platform::DebugPrintf("S start wnd proc %d %d %d\n",iMessage, wParam, lParam);
 
 	// Optional macro recording hook
diff --git a/src/Editor.h b/src/Editor.h
index 4e1ffc782..81806ba77 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -308,11 +308,11 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void ToggleContraction(int line);
 	void EnsureLineVisible(int line);
 
-	virtual long DefWndProc(unsigned int iMessage, unsigned long wParam, long lParam) = 0;
+	virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) = 0;
 	
 public:
 	// Public so scintilla_send_message can use it
-	virtual long WndProc(unsigned int iMessage, unsigned long wParam, long lParam);
+	virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 	// Public so scintilla_set_id can use it
 	int ctrlID;	
 };
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 29fad12d0..eb769923c 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -367,7 +367,7 @@ void ScintillaBase::NotifyStyleToNeeded(int endStyleNeeded) {
 	Editor::NotifyStyleToNeeded(endStyleNeeded);
 }
 
-long ScintillaBase::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
+sptr_t ScintillaBase::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	switch (iMessage) {
 	case SCI_AUTOCSHOW:
 		listType = 0;
diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h
index 5978ca9bc..04abbd10f 100644
--- a/src/ScintillaBase.h
+++ b/src/ScintillaBase.h
@@ -70,7 +70,7 @@ protected:
 	virtual void NotifyStyleToNeeded(int endStyleNeeded);
 public:
 	// Public so scintilla_send_message can use it
-	virtual long WndProc(unsigned int iMessage, unsigned long wParam, long lParam);
+	virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 };
 
 #endif