aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2020-02-18 10:21:17 +1100
committerNeil <nyamatongwe@gmail.com>2020-02-18 10:21:17 +1100
commit59cf5d189985e5e751d0bcac34003ee1c8d6a138 (patch)
treed841a9cea9078dfff468be2b63f54b209796077f
parent4e5f6f01a1b8dfd2dc07f760e79a0ced6d4836a5 (diff)
downloadscintilla-mirror-59cf5d189985e5e751d0bcac34003ee1c8d6a138.tar.gz
Backport: Bug [#2156]. Move IME method declarations together.
Backport of changeset 7988:2fe0730cf4d7.
-rw-r--r--win32/ScintillaWin.cxx9
1 files changed, 4 insertions, 5 deletions
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);