diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-06-09 12:15:05 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-06-09 12:15:05 +1000 |
| commit | b5e8caaacbd47583c79bf862e5e6a021bcfc3964 (patch) | |
| tree | 885ceb140cda8f9721ddeb3a327c5a51e27e3785 /win32 | |
| parent | 5f998b68113dd116c1e938028dddcbcc7425a144 (diff) | |
| download | scintilla-mirror-b5e8caaacbd47583c79bf862e5e6a021bcfc3964.tar.gz | |
Reduce casts by defining methods for common conversions.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/PlatWin.cxx | 4 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index ae0161f84..371edc957 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -3815,11 +3815,11 @@ void Menu::Show(Point pt, const Window &w) { } ColourRGBA Platform::Chrome() { - return ColourRGBA::FromRGB(::GetSysColor(COLOR_3DFACE)); + return ColourRGBA::FromRGB(static_cast<int>(::GetSysColor(COLOR_3DFACE))); } ColourRGBA Platform::ChromeHighlight() { - return ColourRGBA::FromRGB(::GetSysColor(COLOR_3DHIGHLIGHT)); + return ColourRGBA::FromRGB(static_cast<int>(::GetSysColor(COLOR_3DHIGHLIGHT))); } const char *Platform::DefaultFont() { diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 4c9109699..068cef15f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1688,7 +1688,7 @@ sptr_t ScintillaWin::EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lP switch (iMessage) { case EM_LINEFROMCHAR: - if (static_cast<Sci::Position>(wParam) < 0) { + if (PositionFromUPtr(wParam) < 0) { wParam = SelectionStart().Position(); } return pdoc->LineFromPosition(wParam); @@ -2175,7 +2175,7 @@ void ScintillaWin::UpdateBaseElements() { }; bool changed = false; for (const ElementToIndex &ei : eti) { - changed = vs.SetElementBase(ei.element, ColourRGBA::FromRGB(::GetSysColor(ei.nIndex))) || changed; + changed = vs.SetElementBase(ei.element, ColourRGBA::FromRGB(static_cast<int>(::GetSysColor(ei.nIndex)))) || changed; } if (changed) { Redraw(); |