diff options
| author | nyamatongwe <devnull@localhost> | 2011-06-15 21:36:55 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-06-15 21:36:55 +1000 |
| commit | 3effc9e6e4668dc6100d70e76a03a63d5248f7f0 (patch) | |
| tree | 7d5e6357086d004dd160653cbacf1ce1fce440e4 | |
| parent | 7fa8fc1c3cded6bfb0ebe756009a7a1da0d5ffe9 (diff) | |
| download | scintilla-mirror-3effc9e6e4668dc6100d70e76a03a63d5248f7f0.tar.gz | |
Made ScintillaCocoa::ContentView public so it can be used by
ScintillaView and using hwndFrom to find view so idFrom can be
used as it is on other platforms.
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 3 | ||||
| -rw-r--r-- | cocoa/ScintillaView.mm | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 4f7079f23..b24938d05 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -116,7 +116,6 @@ private: int scrollSpeed; int scrollTicks; protected: - NSView* ContentView(); PRectangle GetClientRectangle(); Point ConvertPoint(NSPoint point); @@ -125,6 +124,8 @@ protected: virtual CaseFolder *CaseFolderForEncoding(); virtual std::string CaseMapString(const std::string &s, int caseMapping); public: + NSView* ContentView(); + ScintillaCocoa(NSView* view); virtual ~ScintillaCocoa(); diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index 2d9cdf6a2..5c14560a7 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -691,7 +691,8 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa { // Parent notification. Details are passed as SCNotification structure. SCNotification* scn = reinterpret_cast<SCNotification*>(lParam); - editor = reinterpret_cast<InnerView*>(scn->nmhdr.idFrom).owner; + ScintillaCocoa *psc = reinterpret_cast<ScintillaCocoa*>(scn->nmhdr.hwndFrom); + editor = reinterpret_cast<InnerView*>(psc->ContentView()).owner; switch (scn->nmhdr.code) { case SCN_MARGINCLICK: |