Reimplement notifications from ScintillaCocoa to ScintillaView as a delegate relationship

using ScintillaNotificationProtocol.
Add optional command:idFrom: method to ScintillaNotificationProtocol for command
notifications.
In a future version registerNotifyCallback: and ScintillaCocoa::RegisterNotifyCallback
will be deprecated.

1 files changed, 4 insertions, 0 deletions

diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 4842e2098..c857fd21a 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -86,6 +86,9 @@ private:
   TimerTarget* timerTarget;
   NSEvent* lastMouseEvent;
   
+  id<ScintillaNotificationProtocol> delegate;
+  bool delegateHasCommand;
+
   SciNotifyFunc	notifyProc;
   intptr_t notifyObj;
 
@@ -123,6 +126,7 @@ public:
   ScintillaCocoa(InnerView* view, MarginView* viewMargin);
   virtual ~ScintillaCocoa();
 
+  void SetDelegate(id<ScintillaNotificationProtocol> delegate_);
   void RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback);
   sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);