diff --git a/reactos/base/applications/imagesoft/about.c b/reactos/base/applications/imagesoft/about.c index dcfd8eb69c9..a4d87b986a5 100644 --- a/reactos/base/applications/imagesoft/about.c +++ b/reactos/base/applications/imagesoft/about.c @@ -1,7 +1,10 @@ #include INT_PTR CALLBACK -AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +AboutDialogProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) { HWND hLicenseEditWnd; HICON hIcon = NULL; @@ -11,24 +14,36 @@ AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { case WM_INITDIALOG: - hIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); - SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + hIcon = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); - hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); - LoadString(hInstance, IDS_LICENSE, strLicense, - sizeof(strLicense) / sizeof(TCHAR)); + hLicenseEditWnd = GetDlgItem(hDlg, + IDC_LICENSE_EDIT); - SetWindowText(hLicenseEditWnd, strLicense); + LoadString(hInstance, + IDS_LICENSE, + strLicense, + sizeof(strLicense) / sizeof(TCHAR)); + SetWindowText(hLicenseEditWnd, + strLicense); return TRUE; case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { DestroyIcon(hIcon); - EndDialog(hDlg, LOWORD(wParam)); + EndDialog(hDlg, + LOWORD(wParam)); return TRUE; } diff --git a/reactos/base/applications/imagesoft/imagesoft.rc b/reactos/base/applications/imagesoft/imagesoft.rc index 175ee3a1fae..3b9bbe22191 100644 --- a/reactos/base/applications/imagesoft/imagesoft.rc +++ b/reactos/base/applications/imagesoft/imagesoft.rc @@ -19,6 +19,7 @@ END IDI_ICON ICON "res/imagesoft.ico" +/* main toolbar icons */ IDB_MAINCOPYICON BITMAP DISCARDABLE "res/icons/MainCopyIcon.bmp" IDB_MAINCUTICON BITMAP DISCARDABLE "res/icons/MainCutIcon.bmp" IDB_MAINPASTEICON BITMAP DISCARDABLE "res/icons/MainPasteIcon.bmp" @@ -30,6 +31,7 @@ IDB_MAINPRINTICON BITMAP DISCARDABLE "res/icons/MainPrintIcon.bmp" IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/MainPrintPreIcon.bmp" IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/MainSaveIcon.bmp" +/* text toolbar icons */ IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/TextBoldIcon.bmp" IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/TextItalicIcon.bmp" IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/TextUnderlineIcon.bmp" @@ -37,6 +39,10 @@ IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/TextAlignLeftIcon.bmp" IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/TextAlignCenterIcon.bmp" IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/TextAlignRightIcon.bmp" +/* tools window icons */ + + +/* cursors */ IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" IDC_PAINTBRUSHCURSORMOUSEDOWN CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursorMouseDown.cur"