From 85d45bac1ce4839aef795706bd767440bed8d396 Mon Sep 17 00:00:00 2001 From: RaiKoHoff Date: Fri, 17 Jan 2020 16:50:05 +0100 Subject: [PATCH] + fix: noexcept specifier --- scintilla/src/Editor.cxx | 2 +- scintilla/src/Editor.h | 2 +- scintilla/win32/ScintillaWin.cxx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx index 7a6457136..e2099a29b 100644 --- a/scintilla/src/Editor.cxx +++ b/scintilla/src/Editor.cxx @@ -4278,7 +4278,7 @@ void Editor::DisplayCursor(Window::Cursor c) { wMain.SetCursor(static_cast(cursorMode)); } -bool Editor::DragThreshold(Point ptStart, Point ptNow) { +bool Editor::DragThreshold(Point ptStart, Point ptNow) noexcept { const Point ptDiff = ptStart - ptNow; const XYPOSITION distanceSquared = ptDiff.x * ptDiff.x + ptDiff.y * ptDiff.y; return distanceSquared > 16.0f; diff --git a/scintilla/src/Editor.h b/scintilla/src/Editor.h index d2a3615b9..78cd67f8e 100644 --- a/scintilla/src/Editor.h +++ b/scintilla/src/Editor.h @@ -488,7 +488,7 @@ protected: // ScintillaBase subclass needs access to much of Editor void CopyText(size_t length, const char *text); void SetDragPosition(SelectionPosition newPos); virtual void DisplayCursor(Window::Cursor c); - virtual bool DragThreshold(Point ptStart, Point ptNow); + virtual bool DragThreshold(Point ptStart, Point ptNow) noexcept; virtual void StartDrag(); void DropAt(SelectionPosition position, const char *value, size_t lengthValue, bool moving, bool rectangular); void DropAt(SelectionPosition position, const char *value, bool moving, bool rectangular); diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx index d6767f25a..92d340c66 100644 --- a/scintilla/win32/ScintillaWin.cxx +++ b/scintilla/win32/ScintillaWin.cxx @@ -449,7 +449,7 @@ class ScintillaWin : invalidTimerID, standardTimerID, idleTimerID, fineTimerStart }; - bool SCICALL DragThreshold(Point ptStart, Point ptNow) noexcept override; + bool DragThreshold(Point ptStart, Point ptNow) noexcept override; void StartDrag() override; static int MouseModifiers(uptr_t wParam) noexcept; @@ -507,7 +507,7 @@ class ScintillaWin : void CopyAllowLine() override; bool CanPaste() override; void Paste(bool asBinary) override; - void SCICALL CreateCallTipWindow(PRectangle rc) noexcept override; + void CreateCallTipWindow(PRectangle rc) override; void ClaimSelection() noexcept override; // DBCS @@ -2544,7 +2544,7 @@ void ScintillaWin::Paste(bool asBinary) { Redraw(); } -void ScintillaWin::CreateCallTipWindow(PRectangle) noexcept { +void ScintillaWin::CreateCallTipWindow(PRectangle) { if (!ct.wCallTip.Created()) { HWND wnd = ::CreateWindow(callClassName, L"ACallTip", WS_POPUP, 100, 100, 150, 20,