X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..6c5ac6e1f1a5a3400b51f3bf61d061cf3ed3857a:/src/stc/ScintillaWX.h?ds=sidebyside diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h index c2087c9682..00528bcd0a 100644 --- a/src/stc/ScintillaWX.h +++ b/src/stc/ScintillaWX.h @@ -97,8 +97,12 @@ public: virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); virtual void ClaimSelection(); - virtual LRESULT DefWndProc(UINT iMessage, WPARAM wParam, LPARAM lParam); - virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam); + virtual long DefWndProc(unsigned int iMessage, + unsigned long wParam, + long lParam); + virtual long WndProc(unsigned int iMessage, + unsigned long wParam, + long lParam); virtual void NotifyChange(); virtual void NotifyParent(SCNotification scn); @@ -115,8 +119,9 @@ public: void DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt); void DoButtonUp(Point pt, unsigned int curTime, bool ctrl); void DoButtonMove(Point pt); + void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown); void DoAddChar(char ch); - int DoKeyDown(int key, bool shift, bool ctrl, bool alt); + int DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed); void DoTick() { Tick(); } bool DoDropText(long x, long y, const wxString& data); @@ -142,6 +147,7 @@ private: wxSTCDropTarget* dropTarget; wxDragResult dragResult; + int wheelRotation; }; //----------------------------------------------------------------------