X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/935789271447807376993f92acf6397e3f1e79a5..a029059f92e75b1cff50d0c66be89e6b2b82c955:/include/wx/stc/stc.h

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 9ff6d84e1e..5ab192da78 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, long wp=0, long 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.
@@ -3772,7 +3772,10 @@ public:
 
     virtual void ShowPosition(long pos) { GotoPos(pos); }
 
-    using wxWindow::HitTest;
+    // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal
+    //            access declaration: 'wxWindow' is not a direct base of
+    //            'wxStyledTextCtrl'" with VC6
+    using wxControl::HitTest;
 
     virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const
     {
@@ -3832,6 +3835,10 @@ protected:
 
     bool                m_lastKeyDownConsumed;
 
+    // the timestamp that consists of the last wheel event
+    // added to the time taken to process that event.
+    long m_lastWheelTimestamp;
+
     friend class ScintillaWX;
     friend class Platform;
 #endif // !SWIG