CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ fix: noexcept specifier

Browse Source
This commit is contained in:
RaiKoHoff 2020-01-17 16:50:05 +01:00
parent 4f1b1f8cad
commit 85d45bac1c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scintilla/src/Editor.cxx
View File

@ -4278,7 +4278,7 @@ void Editor::DisplayCursor(Window::Cursor c) {
wMain.SetCursor(static_cast<Window::Cursor>(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;

2
scintilla/src/Editor.h
View File

@ -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);

6
scintilla/win32/ScintillaWin.cxx
View File

@ -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,