From 80dc1dd3785e5c2836d8af5e7804dab3c99b1ce3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 30 Mar 2007 18:34:07 +0000 Subject: [PATCH] compilation fix for Win64 (patch 1690999) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/ScintillaWX.cpp | 4 ++-- contrib/src/stc/ScintillaWX.h | 12 ++++++------ src/stc/ScintillaWX.cpp | 4 ++-- src/stc/ScintillaWX.h | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index 000db9a24b..5736b0c57a 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -680,11 +680,11 @@ bool ScintillaWX::DestroySystemCaret() { //---------------------------------------------------------------------- -long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) { +sptr_t ScintillaWX::DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, sptr_t /*lParam*/) { return 0; } -long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) { +sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { switch (iMessage) { case SCI_CALLTIPSHOW: { // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h index 29cec64796..8b1e1f82e7 100644 --- a/contrib/src/stc/ScintillaWX.h +++ b/contrib/src/stc/ScintillaWX.h @@ -111,12 +111,12 @@ public: virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); virtual void ClaimSelection(); - virtual long DefWndProc(unsigned int iMessage, - unsigned long wParam, - long lParam); - virtual long WndProc(unsigned int iMessage, - unsigned long wParam, - long lParam); + virtual sptr_t DefWndProc(unsigned int iMessage, + uptr_t wParam, + sptr_t lParam); + virtual sptr_t WndProc(unsigned int iMessage, + uptr_t wParam, + sptr_t lParam); virtual void NotifyChange(); virtual void NotifyParent(SCNotification scn); diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 000db9a24b..5736b0c57a 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -680,11 +680,11 @@ bool ScintillaWX::DestroySystemCaret() { //---------------------------------------------------------------------- -long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) { +sptr_t ScintillaWX::DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, sptr_t /*lParam*/) { return 0; } -long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) { +sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { switch (iMessage) { case SCI_CALLTIPSHOW: { // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h index 29cec64796..8b1e1f82e7 100644 --- a/src/stc/ScintillaWX.h +++ b/src/stc/ScintillaWX.h @@ -111,12 +111,12 @@ public: virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); virtual void ClaimSelection(); - virtual long DefWndProc(unsigned int iMessage, - unsigned long wParam, - long lParam); - virtual long WndProc(unsigned int iMessage, - unsigned long wParam, - long lParam); + virtual sptr_t DefWndProc(unsigned int iMessage, + uptr_t wParam, + sptr_t lParam); + virtual sptr_t WndProc(unsigned int iMessage, + uptr_t wParam, + sptr_t lParam); virtual void NotifyChange(); virtual void NotifyParent(SCNotification scn); -- 2.45.2