From fafd43c5783ff2c7366804a028ba0ed7b0c29d31 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 Jun 2008 14:17:35 +0000 Subject: [PATCH] another 64 bit fix: make SendMsg() return wxIntPtr instead of long too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/stc/stc.h | 2 +- src/stc/stc.cpp | 2 +- src/stc/stc.cpp.in | 2 +- src/stc/stc.h.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 359e9306cd..abc9f6ac39 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -3571,7 +3571,7 @@ public: // NB: this method is not really const as it can modify the control but it // has to be declared as such as it's called from both const and // non-const methods and we can't distinguish between the two - long SendMsg(int msg, wxUIntPtr wp=0, wxIntPtr lp=0) const; + wxIntPtr SendMsg(int msg, wxUIntPtr wp=0, wxIntPtr lp=0) const; // Set the vertical scrollbar to use instead of the ont that's built-in. diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index 3123f90443..a81c6c71aa 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -224,7 +224,7 @@ wxStyledTextCtrl::~wxStyledTextCtrl() { //---------------------------------------------------------------------- -long wxStyledTextCtrl::SendMsg(int msg, wxUIntPtr wp, wxIntPtr lp) const +wxIntPtr wxStyledTextCtrl::SendMsg(int msg, wxUIntPtr wp, wxIntPtr lp) const { return m_swx->WndProc(msg, wp, lp); } diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in index cd2b9ee0d7..3ce719586b 100644 --- a/src/stc/stc.cpp.in +++ b/src/stc/stc.cpp.in @@ -224,7 +224,7 @@ wxStyledTextCtrl::~wxStyledTextCtrl() { //---------------------------------------------------------------------- -long wxStyledTextCtrl::SendMsg(int msg, wxUIntPtr wp, wxIntPtr lp) const +wxIntPtr wxStyledTextCtrl::SendMsg(int msg, wxUIntPtr wp, wxIntPtr lp) const { return m_swx->WndProc(msg, wp, lp); } diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index b76d840735..4f313a11e3 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -204,7 +204,7 @@ public: // NB: this method is not really const as it can modify the control but it // has to be declared as such as it's called from both const and // non-const methods and we can't distinguish between the two - long SendMsg(int msg, wxUIntPtr wp=0, wxIntPtr lp=0) const; + wxIntPtr SendMsg(int msg, wxUIntPtr wp=0, wxIntPtr lp=0) const; // Set the vertical scrollbar to use instead of the ont that's built-in. -- 2.45.2