Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSPAINT] mouse.cpp: Use override keywords

Browse source 
CORE-18867
This commit is contained in:
Katayama Hirofumi MZ 2023-06-14 16:01:10 +09:00
parent 2b623c1d04
commit 6d9b7f77ad
1 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

80
base/applications/mspaint/mouse.cpp
View file

@ -108,7 +108,7 @@ struct FreeSelTool : ToolBase
{ {
} }
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override
{ {
selectionModel.Landing(); selectionModel.Landing();
if (bLeftButton) if (bLeftButton)
@ -122,7 +122,7 @@ struct FreeSelTool : ToolBase
m_bLeftButton = bLeftButton; m_bLeftButton = bLeftButton;
} }
void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override
{ {
if (bLeftButton) if (bLeftButton)
{ {
@ -134,7 +134,7 @@ struct FreeSelTool : ToolBase
} }
} }
void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override
{ {
if (bLeftButton) if (bLeftButton)
{ {
@ -155,7 +155,7 @@ struct FreeSelTool : ToolBase
} }
} }
void OnFinishDraw() void OnFinishDraw() override
{ {
if (m_bLeftButton) if (m_bLeftButton)
canvasWindow.Invalidate(FALSE); canvasWindow.Invalidate(FALSE);
@ -164,7 +164,7 @@ struct FreeSelTool : ToolBase
ToolBase::OnFinishDraw(); ToolBase::OnFinishDraw();
} }
void OnCancelDraw() void OnCancelDraw() override
{ {
if (m_bLeftButton) if (m_bLeftButton)
imageModel.Undo(TRUE); imageModel.Undo(TRUE);
@ -182,7 +182,7 @@ struct RectSelTool : ToolBase
{ {
} }
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override
{ {
selectionModel.Landing(); selectionModel.Landing();
if (bLeftButton) if (bLeftButton)
@ -194,7 +194,7 @@ struct RectSelTool : ToolBase
m_bLeftButton = bLeftButton; m_bLeftButton = bLeftButton;
} }
void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override
{ {
if (bLeftButton) if (bLeftButton)
{ {
@ -206,7 +206,7 @@ struct RectSelTool : ToolBase
} }
} }
void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override
{ {
if (bLeftButton) if (bLeftButton)
{ {
@ -218,7 +218,7 @@ struct RectSelTool : ToolBase
} }
} }
void OnFinishDraw() void OnFinishDraw() override
{ {
if (m_bLeftButton) if (m_bLeftButton)
canvasWindow.Invalidate(FALSE); canvasWindow.Invalidate(FALSE);
@ -227,7 +227,7 @@ struct RectSelTool : ToolBase
ToolBase::OnFinishDraw(); ToolBase::OnFinishDraw();
} }
void OnCancelDraw() void OnCancelDraw() override
{ {
if (m_bLeftButton) if (m_bLeftButton)
imageModel.Undo(TRUE); imageModel.Undo(TRUE);
@ -244,23 +244,23 @@ struct GenericDrawTool : ToolBase
virtual void draw(BOOL bLeftButton, LONG x, LONG y) = 0; virtual void draw(BOOL bLeftButton, LONG x, LONG y) = 0;
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override
{ {
imageModel.PushImageForUndo(); imageModel.PushImageForUndo();
draw(bLeftButton, x, y); draw(bLeftButton, x, y);
} }
void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override
{ {
draw(bLeftButton, x, y); draw(bLeftButton, x, y);
} }
void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override
{ {
draw(bLeftButton, x, y); draw(bLeftButton, x, y);
} }
void OnCancelDraw() void OnCancelDraw() override
{ {
OnButtonUp(FALSE, 0, 0); OnButtonUp(FALSE, 0, 0);
imageModel.Undo(TRUE); imageModel.Undo(TRUE);
@ -275,7 +275,7 @@ struct RubberTool : GenericDrawTool
{ {
} }
virtual void draw(BOOL bLeftButton, LONG x, LONG y) void draw(BOOL bLeftButton, LONG x, LONG y) override
{ {
if (bLeftButton) if (bLeftButton)
Erase(m_hdc, last.x, last.y, x, y, m_bg, toolsModel.GetRubberRadius()); Erase(m_hdc, last.x, last.y, x, y, m_bg, toolsModel.GetRubberRadius());
@ -291,7 +291,7 @@ struct FillTool : ToolBase
{ {
} }
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override
{ {
imageModel.PushImageForUndo(); imageModel.PushImageForUndo();
Fill(m_hdc, x, y, bLeftButton ? m_fg : m_bg); Fill(m_hdc, x, y, bLeftButton ? m_fg : m_bg);
@ -320,12 +320,12 @@ struct ColorTool : ToolBase
paletteModel.SetBgColor(rgbColor); paletteModel.SetBgColor(rgbColor);
} }
void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override
{ {
fetchColor(bLeftButton, x, y); fetchColor(bLeftButton, x, y);
} }
void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override
{ {
fetchColor(bLeftButton, x, y); fetchColor(bLeftButton, x, y);
toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool());
@ -339,7 +339,7 @@ struct ZoomTool : ToolBase
{ {
} }
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override
{ {
imageModel.PushImageForUndo(); imageModel.PushImageForUndo();
if (bLeftButton) if (bLeftButton)
@ -362,7 +362,7 @@ struct PenTool : GenericDrawTool
{ {
} }
virtual void draw(BOOL bLeftButton, LONG x, LONG y) void draw(BOOL bLeftButton, LONG x, LONG y) override
{ {
COLORREF rgb = bLeftButton ? m_fg : m_bg; COLORREF rgb = bLeftButton ? m_fg : m_bg;
Line(m_hdc, last.x, last.y, x, y, rgb, 1); Line(m_hdc, last.x, last.y, x, y, rgb, 1);
@ -377,7 +377,7 @@ struct BrushTool : GenericDrawTool
{ {
} }
virtual void draw(BOOL bLeftButton, LONG x, LONG y) void draw(BOOL bLeftButton, LONG x, LONG y) override
{ {
COLORREF rgb = bLeftButton ? m_fg : m_bg; COLORREF rgb = bLeftButton ? m_fg : m_bg;
Brush(m_hdc, last.x, last.y, x, y, rgb, toolsModel.GetBrushStyle()); Brush(m_hdc, last.x, last.y, x, y, rgb, toolsModel.GetBrushStyle());
@ -391,7 +391,7 @@ struct AirBrushTool : GenericDrawTool
{ {
} }
virtual void draw(BOOL bLeftButton, LONG x, LONG y) void draw(BOOL bLeftButton, LONG x, LONG y) override
{ {
COLORREF rgb = bLeftButton ? m_fg : m_bg; COLORREF rgb = bLeftButton ? m_fg : m_bg;
Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth()); Airbrush(m_hdc, x, y, rgb, toolsModel.GetAirBrushWidth());
@ -414,7 +414,7 @@ struct TextTool : ToolBase
RectSel(m_hdc, start.x, start.y, pt.x, pt.y); RectSel(m_hdc, start.x, start.y, pt.x, pt.y);
} }
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override
{ {
if (!textEditWindow.IsWindow()) if (!textEditWindow.IsWindow())
textEditWindow.Create(canvasWindow); textEditWindow.Create(canvasWindow);
@ -423,12 +423,12 @@ struct TextTool : ToolBase
UpdatePoint(x, y); UpdatePoint(x, y);
} }
void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override
{ {
UpdatePoint(x, y); UpdatePoint(x, y);
} }
void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.Undo(TRUE); imageModel.Undo(TRUE);
@ -494,7 +494,7 @@ struct TextTool : ToolBase
textEditWindow.SetFocus(); textEditWindow.SetFocus();
} }
void OnFinishDraw() void OnFinishDraw() override
{ {
toolsModel.OnButtonDown(TRUE, -1, -1, TRUE); toolsModel.OnButtonDown(TRUE, -1, -1, TRUE);
toolsModel.OnButtonUp(TRUE, -1, -1); toolsModel.OnButtonUp(TRUE, -1, -1);
@ -509,7 +509,7 @@ struct LineTool : GenericDrawTool
{ {
} }
virtual void draw(BOOL bLeftButton, LONG x, LONG y) void draw(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
@ -547,7 +547,7 @@ struct BezierTool : ToolBase
m_bLeftButton = bLeftButton; m_bLeftButton = bLeftButton;
} }
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override
{ {
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
@ -559,7 +559,7 @@ struct BezierTool : ToolBase
} }
} }
void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
@ -567,7 +567,7 @@ struct BezierTool : ToolBase
draw(bLeftButton); draw(bLeftButton);
} }
void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
draw(bLeftButton); draw(bLeftButton);
@ -576,14 +576,14 @@ struct BezierTool : ToolBase
pointSP = 0; pointSP = 0;
} }
void OnCancelDraw() void OnCancelDraw() override
{ {
OnButtonUp(FALSE, 0, 0); OnButtonUp(FALSE, 0, 0);
imageModel.Undo(TRUE); imageModel.Undo(TRUE);
ToolBase::OnCancelDraw(); ToolBase::OnCancelDraw();
} }
void OnFinishDraw() void OnFinishDraw() override
{ {
if (pointSP) if (pointSP)
{ {
@ -602,7 +602,7 @@ struct RectTool : GenericDrawTool
{ {
} }
virtual void draw(BOOL bLeftButton, LONG x, LONG y) void draw(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
@ -635,7 +635,7 @@ struct ShapeTool : ToolBase
m_bLeftButton = bLeftButton; m_bLeftButton = bLeftButton;
} }
void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override
{ {
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
@ -652,7 +652,7 @@ struct ShapeTool : ToolBase
} }
} }
void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
@ -662,7 +662,7 @@ struct ShapeTool : ToolBase
draw(bLeftButton, x, y, FALSE); draw(bLeftButton, x, y, FALSE);
} }
void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0))
@ -686,13 +686,13 @@ struct ShapeTool : ToolBase
pointSP--; pointSP--;
} }
void OnCancelDraw() void OnCancelDraw() override
{ {
imageModel.Undo(TRUE); imageModel.Undo(TRUE);
ToolBase::OnCancelDraw(); ToolBase::OnCancelDraw();
} }
void OnFinishDraw() void OnFinishDraw() override
{ {
if (pointSP) if (pointSP)
{ {
@ -711,7 +711,7 @@ struct EllipseTool : GenericDrawTool
{ {
} }
virtual void draw(BOOL bLeftButton, LONG x, LONG y) void draw(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
@ -730,7 +730,7 @@ struct RRectTool : GenericDrawTool
{ {
} }
virtual void draw(BOOL bLeftButton, LONG x, LONG y) void draw(BOOL bLeftButton, LONG x, LONG y) override
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)