From 59cf5d189985e5e751d0bcac34003ee1c8d6a138 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 18 Feb 2020 10:21:17 +1100 Subject: Backport: Bug [#2156]. Move IME method declarations together. Backport of changeset 7988:2fe0730cf4d7. --- win32/ScintillaWin.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'win32') diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index d2b0568d2..32f913dce 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -346,6 +346,10 @@ class ScintillaWin : bool PaintDC(HDC hdc); sptr_t WndPaint(); + // DBCS + void ImeStartComposition(); + void ImeEndComposition(); + LRESULT ImeOnReconvert(LPARAM lParam); sptr_t HandleCompositionWindowed(uptr_t wParam, sptr_t lParam); sptr_t HandleCompositionInline(uptr_t wParam, sptr_t lParam); static bool KoreanIME() noexcept; @@ -393,11 +397,6 @@ class ScintillaWin : void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override; void ClaimSelection() override; - // DBCS - void ImeStartComposition(); - void ImeEndComposition(); - LRESULT ImeOnReconvert(LPARAM lParam); - void GetIntelliMouseParameters() noexcept; void CopyToClipboard(const SelectionText &selectedText) override; void ScrollMessage(WPARAM wParam); -- cgit v1.2.3