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.