diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-09-12 11:22:39 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-09-12 11:22:39 +1000 |
| commit | d744f3aedb7b09625f45ef659ed4c787bf45c42f (patch) | |
| tree | 00da8be0e8c426d00c3195d22fd998792187afba /cocoa/ScintillaCocoa.mm | |
| parent | 2fffff0d5d691f314829b0b3c8ecd59707afdb38 (diff) | |
| download | scintilla-mirror-d744f3aedb7b09625f45ef659ed4c787bf45c42f.tar.gz | |
Allow choice between windowed and inline IME.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index f8c53932c..5f5d68b73 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -395,6 +395,7 @@ ScintillaCocoa::ScintillaCocoa(SCIContentView* view, SCIMarginView* viewMargin) idleTimer = NULL; observer = NULL; layerFindIndicator = NULL; + imeInteraction = imeInline; for (TickReason tr=tickCaret; tr<=tickPlatform; tr = static_cast<TickReason>(tr+1)) { timers[tr] = nil; @@ -826,6 +827,10 @@ sptr_t ScintillaCocoa::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPar case SCI_GETDIRECTPOINTER: return reinterpret_cast<sptr_t>(this); + case SCI_SETIMEINTERACTION: + // Only inline IME supported on Cocoa + break; + case SCI_GRABFOCUS: [[ContentView() window] makeFirstResponder:ContentView()]; break; |