Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSPAINT] Encapsulation: hCurFill, hCurColor etc.

Browse source 
CORE-18867
This commit is contained in:
Katayama Hirofumi MZ 2023-03-18 08:09:26 +09:00
parent d40de8f47c
commit cc3b53fef9
4 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
base/applications/mspaint/globalvar.h
View file

@ -36,12 +36,6 @@ extern OPENFILENAME sfn;
extern HICON hNontranspIcon;
extern HICON hTranspIcon;
extern HCURSOR hCurFill;
extern HCURSOR hCurColor;
extern HCURSOR hCurZoom;
extern HCURSOR hCurPen;
extern HCURSOR hCurAirbrush;
extern HINSTANCE hProgInstance;
extern TCHAR filepathname[1000];

25
base/applications/mspaint/imgarea.cpp
View file

@ -8,12 +8,21 @@
* Katayama Hirofumi MZ
*/
/* INCLUDES *********************************************************/
#include "precomp.h"
/* FUNCTIONS ********************************************************/
LRESULT CImgAreaWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
m_hCurFill = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_FILL));
m_hCurColor = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_COLOR));
m_hCurZoom = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_ZOOM));
m_hCurPen = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_PEN));
m_hCurAirbrush = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_AIRBRUSH));
return 0;
}
void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY)
{
HDC hdc;
@ -115,22 +124,22 @@ LRESULT CImgAreaWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO
switch (toolsModel.GetActiveTool())
{
case TOOL_FILL:
SetCursor(hCurFill);
::SetCursor(m_hCurFill);
break;
case TOOL_COLOR:
SetCursor(hCurColor);
::SetCursor(m_hCurColor);
break;
case TOOL_ZOOM:
SetCursor(hCurZoom);
::SetCursor(m_hCurZoom);
break;
case TOOL_PEN:
SetCursor(hCurPen);
::SetCursor(m_hCurPen);
break;
case TOOL_AIRBRUSH:
SetCursor(hCurAirbrush);
::SetCursor(m_hCurAirbrush);
break;
default:
SetCursor(LoadCursor(NULL, IDC_CROSS));
::SetCursor(::LoadCursor(NULL, IDC_CROSS));
}
return 0;
}

8
base/applications/mspaint/imgarea.h
View file

@ -42,9 +42,17 @@ public:
MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged)
MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown)
MESSAGE_HANDLER(WM_CTLCOLOREDIT, OnCtlColorEdit)
MESSAGE_HANDLER(WM_CREATE, OnCreate)
END_MSG_MAP()
private:
HCURSOR m_hCurFill;
HCURSOR m_hCurColor;
HCURSOR m_hCurZoom;
HCURSOR m_hCurPen;
HCURSOR m_hCurAirbrush;
LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

12
base/applications/mspaint/main.cpp
View file

@ -35,12 +35,6 @@ OPENFILENAME sfn;
HICON hNontranspIcon;
HICON hTranspIcon;
HCURSOR hCurFill;
HCURSOR hCurColor;
HCURSOR hCurZoom;
HCURSOR hCurPen;
HCURSOR hCurAirbrush;
HINSTANCE hProgInstance;
TCHAR filepathname[1000];
@ -204,12 +198,6 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
hTranspIcon =
(HICON) LoadImage(hThisInstance, MAKEINTRESOURCE(IDI_TRANSPARENT), IMAGE_ICON, 40, 30, LR_DEFAULTCOLOR);
hCurFill = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_FILL));
hCurColor = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_COLOR));
hCurZoom = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_ZOOM));
hCurPen = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_PEN));
hCurAirbrush = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_AIRBRUSH));
RECT toolBoxContainerPos = {2, 2, 2 + 52, 2 + 350};
toolBoxContainer.Create(hwnd, toolBoxContainerPos, NULL, WS_CHILD | WS_VISIBLE);
/* creating the tool settings child window */