From d744f3aedb7b09625f45ef659ed4c787bf45c42f Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 12 Sep 2014 11:22:39 +1000
Subject: Allow choice between windowed and inline IME.

---
 cocoa/ScintillaCocoa.mm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'cocoa')

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;
-- 
cgit v1.2.3