X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d134f1702e983b6588c5783b10a401e8bdb69314..cd5e9298159e58f57e05f3b76c9d4a45e1eefe12:/src/stc/ScintillaWX.h?ds=sidebyside diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h index b773eac3a9..3174e9efc3 100644 --- a/src/stc/ScintillaWX.h +++ b/src/stc/ScintillaWX.h @@ -19,6 +19,11 @@ //---------------------------------------------------------------------- +#include +#include +#include +#include + #include "Platform.h" #include "Scintilla.h" @@ -56,6 +61,7 @@ class ScintillaWX; //---------------------------------------------------------------------- // Helper classes +#if wxUSE_DRAG_AND_DROP class wxSTCDropTarget : public wxTextDropTarget { public: void SetScintilla(ScintillaWX* swx) { @@ -70,7 +76,7 @@ public: private: ScintillaWX* swx; }; - +#endif //---------------------------------------------------------------------- @@ -119,14 +125,17 @@ 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 DoAddChar(char ch); - int DoKeyDown(int key, bool shift, bool ctrl, bool alt); + void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown); + void DoAddChar(int key); + int DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed); void DoTick() { Tick(); } +#if wxUSE_DRAG_AND_DROP bool DoDropText(long x, long y, const wxString& data); wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def); wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); void DoDragLeave(); +#endif void DoCommand(int ID); void DoContextMenu(Point pt); @@ -144,8 +153,11 @@ private: bool capturedMouse; wxStyledTextCtrl* stc; +#if wxUSE_DRAG_AND_DROP wxSTCDropTarget* dropTarget; wxDragResult dragResult; +#endif + int wheelRotation; }; //----------------------------------------------------------------------