diff options
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.h')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index adbf11efd..053e59cc8 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -29,6 +29,9 @@ #include <algorithm> #include <memory> +#include "ScintillaTypes.h" +#include "ScintillaMessages.h" +#include "ScintillaStructures.h" #include "Scintilla.h" #include "Debugging.h" #include "Geometry.h" @@ -71,7 +74,7 @@ class ScintillaEditBase; -namespace Scintilla { +namespace Scintilla::Internal { class ScintillaQt : public QObject, public ScintillaBase { Q_OBJECT @@ -86,14 +89,14 @@ signals: void horizontalRangeChanged(int max, int page); void verticalRangeChanged(int max, int page); - void notifyParent(SCNotification scn); + void notifyParent(Scintilla::NotificationData scn); void notifyChange(); // Clients can use this hook to add additional // formats (e.g. rich text) to the MIME data. void aboutToCopy(QMimeData *data); - void command(uptr_t wParam, sptr_t lParam); + void command(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam); private slots: void onIdle(); @@ -122,7 +125,7 @@ private: void ClaimSelection() override; void NotifyChange() override; void NotifyFocus(bool focus) override; - void NotifyParent(SCNotification scn) override; + void NotifyParent(Scintilla::NotificationData scn) override; void NotifyURIDropped(const char *uri); int timers[static_cast<size_t>(TickReason::dwell)+1]; bool FineTickerRunning(TickReason reason) override; @@ -134,7 +137,7 @@ private: void SetMouseCapture(bool on) override; bool HaveMouseCapture() override; void StartDrag() override; - int CharacterSetOfDocument() const; + Scintilla::CharacterSet CharacterSetOfDocument() const; const char *CharacterSetIDOfDocument() const; QString StringFromDocument(const char *s) const; QByteArray BytesForDocument(const QString &text) const; @@ -143,8 +146,8 @@ private: void CreateCallTipWindow(PRectangle rc) override; void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override; - sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; - sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; + sptr_t WndProc(Scintilla::Message iMessage, uptr_t wParam, sptr_t lParam) override; + sptr_t DefWndProc(Scintilla::Message iMessage, uptr_t wParam, sptr_t lParam) override; static sptr_t DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); |