diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/PlatWin.cxx | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 12 | ||||
| -rw-r--r-- | win32/makefile | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index bf4f0503b..673f914fa 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -2462,7 +2462,7 @@ POINT ListBoxX::MinTrackSize() const { POINT ListBoxX::MaxTrackSize() const { PRectangle rc = PRectangle::FromInts(0, 0, - Platform::Maximum(MinClientWidth(), + Platform::Maximum(MinClientWidth(), maxCharWidth * maxItemCharacters + static_cast<int>(TextInset.x) * 2 + TextOffset() + ::GetSystemMetrics(SM_CXVSCROLL)), ItemHeight() * lti.Count()); diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 92df2aad6..a5733d39b 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -987,7 +987,7 @@ void ScintillaWin::EscapeHanja() { } void ScintillaWin::ToggleHanja() { - // If selection, convert every hanja to hangul within the main range. + // If selection, convert every hanja to hangul within the main range. // If no selection, commit to IME. if (sel.Count() > 1) { return; // Do not allow multi carets. @@ -1557,7 +1557,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam); case WM_IME_COMPOSITION: - if (KoreanIME() || imeInteraction == imeInline) { + if (KoreanIME() || imeInteraction == imeInline) { return HandleCompositionInline(wParam, lParam); } else { return HandleCompositionWindowed(wParam, lParam); @@ -1704,7 +1704,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam #endif case SCI_SETTECHNOLOGY: - if ((wParam == SC_TECHNOLOGY_DEFAULT) || + if ((wParam == SC_TECHNOLOGY_DEFAULT) || (wParam == SC_TECHNOLOGY_DIRECTWRITERETAIN) || (wParam == SC_TECHNOLOGY_DIRECTWRITEDC) || (wParam == SC_TECHNOLOGY_DIRECTWRITE)) { @@ -2203,7 +2203,7 @@ void ScintillaWin::Paste() { if (!::OpenClipboard(MainHWND())) return; UndoGroup ug(pdoc); - const bool isLine = SelectionEmpty() && + const bool isLine = SelectionEmpty() && (::IsClipboardFormatAvailable(cfLineSelect) || ::IsClipboardFormatAvailable(cfVSLineTag)); ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH); bool isRectangular = (::IsClipboardFormatAvailable(cfColumnSelect) != 0); @@ -2702,7 +2702,7 @@ LRESULT ScintillaWin::ImeOnReconvert(LPARAM lParam) { rc->dwCompStrLen = (DWORD)static_cast<int>(rcCompWstring.length()); rc->dwCompStrOffset = (DWORD)static_cast<int>(rcCompWstart.length()) * sizeof(wchar_t); rc->dwTargetStrLen = rc->dwCompStrLen; - rc->dwTargetStrOffset =rc->dwCompStrOffset; + rc->dwTargetStrOffset =rc->dwCompStrOffset; IMContext imc(MainHWND()); if (!imc.hIMC) @@ -2718,7 +2718,7 @@ LRESULT ScintillaWin::ImeOnReconvert(LPARAM lParam) { std::string tgCompStart = StringEncode(rcFeed.substr(0, tgWstart), codePage); std::string tgComp = StringEncode(rcFeed.substr(tgWstart, tgWlen), codePage); - // No selection needs to adjust reconvert start position for IME set. + // No selection needs to adjust reconvert start position for IME set. int adjust = static_cast<int>(tgCompStart.length() - rcCompStart.length()); int docCompLen = static_cast<int>(tgComp.length()); diff --git a/win32/makefile b/win32/makefile index 7d7d02789..668812553 100644 --- a/win32/makefile +++ b/win32/makefile @@ -117,7 +117,7 @@ $(LEXCOMPONENT): $(LOBJS) Scintilla.def $(LEXLIB): $(LEXOBJS) $(AR) rc $@ $^ - $(RANLIB) $@ + $(RANLIB) $@ # Automatically generate dependencies for most files with "make deps" include deps.mak |