diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-05-24 19:31:06 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-05-24 19:31:06 +1000 |
| commit | 92290868cf9753d2df0d494cb44e2ff62a570b58 (patch) | |
| tree | 001e6cfce84372a03997de3138d630751ee8d38a /cocoa/ScintillaCocoa.h | |
| parent | ee1886079d0a5cd350ee8e3379be347943ba93ae (diff) | |
| download | scintilla-mirror-92290868cf9753d2df0d494cb44e2ff62a570b58.tar.gz | |
Define C++ version of the Scintilla API in ScintillaTypes.h, ScintillaMessages.h
and ScintillaStructures.h using scoped enumerations.
Use these headers instead of Scintilla.h internally.
External definitions go in the Scintilla namespace and internal definitio0ns in
Scintilla::Internal.
Diffstat (limited to 'cocoa/ScintillaCocoa.h')
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index f99c39770..40c389f5f 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -80,7 +80,7 @@ extern "C" NSString *ScintillaRecPboardType; - (void) idleTriggered: (NSNotification *) notification; @end -namespace Scintilla { +namespace Scintilla::Internal { /** * Main scintilla class, implemented for OS X (Cocoa). @@ -137,7 +137,7 @@ public: void SetDelegate(id<ScintillaNotificationProtocol> delegate_); void RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback); - sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; + sptr_t WndProc(Scintilla::Message iMessage, uptr_t wParam, sptr_t lParam) override; NSScrollView *ScrollContainer() const; SCIContentView *ContentView(); @@ -146,7 +146,7 @@ public: bool Draw(NSRect rect, CGContextRef gc); void PaintMargin(NSRect aRect); - sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; + sptr_t DefWndProc(Scintilla::Message iMessage, uptr_t wParam, sptr_t lParam) override; void TickFor(TickReason reason) override; bool FineTickerRunning(TickReason reason) override; void FineTickerStart(TickReason reason, int millis, int tolerance) override; @@ -166,7 +166,7 @@ public: // Notifications for the owner. void NotifyChange() override; void NotifyFocus(bool focus) override; - void NotifyParent(SCNotification scn) override; + void NotifyParent(Scintilla::NotificationData scn) override; void NotifyURIDropped(const char *uri); bool HasSelection(); @@ -198,7 +198,7 @@ public: void ObserverRemove(); void IdleWork() override; void QueueIdleWork(WorkItems items, Sci::Position upTo) override; - ptrdiff_t InsertText(NSString *input, CharacterSource charSource); + ptrdiff_t InsertText(NSString *input, Scintilla::CharacterSource charSource); NSRange PositionsFromCharacters(NSRange rangeCharacters) const; NSRange CharactersFromPositions(NSRange rangePositions) const; NSString *RangeTextAsString(NSRange rangePositions) const; |