add resource ID names

Author: katahiromz

src/MAddCtrlDlg.hpp

@@ -156,7 +156,8 @@ class MAddCtrlDlg : public MDialogBase
             m_himlControls = NULL;
         }
         m_himlControls = ImageList_LoadBitmap(
-            GetModuleHandle(NULL), MAKEINTRESOURCE(2), 16, 0, RGB(255, 0, 255));
+            GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_CONTROLS),
+            16, 0, RGB(255, 0, 255));
         m_hTB.SetImageList(m_himlControls);
 
         buttons.resize(nCount);

src/MBmpView.hpp

@@ -99,7 +99,7 @@ class MBmpView : public MWindowBase
         if (m_hPlayButton == NULL)
             return FALSE;
 
-        HICON hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(102));
+        HICON hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_PLAY));
         SendMessage(m_hPlayButton, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);
         SetWindowFont(m_hPlayButton, GetStockFont(DEFAULT_GUI_FONT), TRUE);
         return TRUE;

src/MCtrlPropDlg.hpp

@@ -380,7 +380,8 @@ class MCtrlPropDlg : public MDialogBase
             m_himlControls = NULL;
         }
         m_himlControls = ImageList_LoadBitmap(
-            GetModuleHandle(NULL), MAKEINTRESOURCE(2), 16, 0, RGB(255, 0, 255));
+            GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_CONTROLS),
+            16, 0, RGB(255, 0, 255));
         m_hTB.SetImageList(m_himlControls);
 
         buttons.resize(nCount);

src/MEditAccelDlg.hpp

@@ -323,8 +323,8 @@ class MEditAccelDlg : public MDialogBase
     MEditAccelDlg(AccelRes& accel_res, ConstantsDB& db)
         : MDialogBase(IDD_EDITACCEL), m_accel_res(accel_res), m_db(db)
     {
-        m_hIcon = LoadIconDx(3);
-        m_hIconSm = LoadSmallIconDx(3);
+        m_hIcon = LoadIconDx(IDI_SMILY);
+        m_hIconSm = LoadSmallIconDx(IDI_SMILY);
     }
 
     ~MEditAccelDlg()

src/MItemSearchDlg.hpp

@@ -68,8 +68,8 @@ class MItemSearchDlg : public MDialogBase
     MItemSearchDlg(ITEM_SEARCH& search) 
         : MDialogBase(IDD_ITEMSEARCH), m_search(search)
     {
-        m_hIcon = LoadIconDx(4);
-        m_hIconSm = LoadSmallIconDx(4);
+        m_hIcon = LoadIconDx(IDI_FIND);
+        m_hIconSm = LoadSmallIconDx(IDI_FIND);
     }
 
     virtual ~MItemSearchDlg()

src/MMessagesDlg.hpp

@@ -221,8 +221,8 @@ class MMessagesDlg : public MDialogBase
     MMessagesDlg(ConstantsDB& db, MessageRes& msg_res)
         : MDialogBase(IDD_MESSAGES), m_msg_res(msg_res), m_db(db)
     {
-        m_hIcon = LoadIconDx(3);
-        m_hIconSm = LoadSmallIconDx(3);
+        m_hIcon = LoadIconDx(IDI_SMILY);
+        m_hIconSm = LoadSmallIconDx(IDI_SMILY);
     }
 
     ~MMessagesDlg()

src/MRadWindow.hpp

@@ -82,12 +82,14 @@ class MRadCtrl : public MWindowBase
 
     static HICON& Icon()
     {
-        static HICON s_hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(2));
+        static HICON s_hIcon = LoadIcon(GetModuleHandle(NULL),
+                                        MAKEINTRESOURCE(IDI_ICO));
         return s_hIcon;
     }
     static HBITMAP& Bitmap()
     {
-        static HBITMAP s_hbm = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(1));
+        static HBITMAP s_hbm = LoadBitmap(GetModuleHandle(NULL),
+                                          MAKEINTRESOURCE(IDB_BMP));
         return s_hbm;
     }
 
@@ -1433,10 +1435,9 @@ class MRadWindow : public MWindowBase
 
     BOOL OnCreate(HWND hwnd, LPCREATESTRUCT lpCreateStruct)
     {
-        m_hIcon = LoadIconDx(3);
+        m_hIcon = LoadIconDx(IDI_SMILY);
+        m_hIconSm = LoadSmallIconDx(IDI_SMILY);
         SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)m_hIcon);
-
-        m_hIconSm = LoadSmallIconDx(3);
         SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)m_hIconSm);
 
         if (m_settings.bResumeWindowPos)

src/RisohEditor.cpp

@@ -1520,7 +1520,7 @@ void MMainWnd::OnAbout(HWND hwnd)
     params.lpszText = LoadStringDx(IDS_VERSIONINFO);
     params.lpszCaption = LoadStringDx(IDS_APPNAME);
     params.dwStyle = MB_OK | MB_USERICON;
-    params.lpszIcon = MAKEINTRESOURCEW(1);
+    params.lpszIcon = MAKEINTRESOURCEW(IDI_MAIN);
     params.dwLanguageId = LANG_USER_DEFAULT;
 
     MWindowBase::HookCenterMsgBoxDx(TRUE);
@@ -6552,9 +6552,9 @@ BOOL MMainWnd::OnCreate(HWND hwnd, LPCREATESTRUCT lpCreateStruct)
     m_hImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 3, 1);
     if (m_hImageList == NULL)
         return FALSE;
-    m_hFileIcon = LoadSmallIconDx(100);
+    m_hFileIcon = LoadSmallIconDx(IDI_FILE);
+    m_hFolderIcon = LoadSmallIconDx(IDI_FOLDER);
     ImageList_AddIcon(m_hImageList, m_hFileIcon);
-    m_hFolderIcon = LoadSmallIconDx(101);
     ImageList_AddIcon(m_hImageList, m_hFolderIcon);
 
     m_hToolBar = ToolBar_Create(hwnd);
@@ -6709,8 +6709,8 @@ BOOL MMainWnd::StartDx()
     MSplitterWnd::CursorNS() = LoadCursor(m_hInst, MAKEINTRESOURCE(1));
     MSplitterWnd::CursorWE() = LoadCursor(m_hInst, MAKEINTRESOURCE(2));
 
-    m_hIcon = LoadIconDx(1);
-    m_hIconSm = LoadSmallIconDx(1);
+    m_hIcon = LoadIconDx(IDI_MAIN);
+    m_hIconSm = LoadSmallIconDx(IDI_MAIN);
     m_hAccel = ::LoadAccelerators(m_hInst, MAKEINTRESOURCE(1));
 
     if (!CreateWindowDx(NULL, MAKEINTRESOURCE(IDS_APPNAME),

src/RisohEditor_res.rc

@@ -24,22 +24,22 @@
 // UTF-8
 #pragma code_page(65001)
 
-1 ICON "res\\RisohEditor.ico"
-2 ICON "res\\ico.ico"
-3 ICON "res\\smily.ico"
-4 ICON "res\\find.ico"
+IDI_MAIN    ICON "res\\RisohEditor.ico"
+IDI_ICO     ICON "res\\ico.ico"
+IDI_SMILY   ICON "res\\smily.ico"
+IDI_FIND    ICON "res\\find.ico"
 
-100 ICON "res\\file.ico"
-101 ICON "res\\folder.ico"
-102 ICON "res\\play.ico"
+IDI_FILE    ICON "res\\file.ico"
+IDI_FOLDER  ICON "res\\folder.ico"
+IDI_PLAY    ICON "res\\play.ico"
 
 1 CURSOR "res\\cursor-ns.cur"
 2 CURSOR "res\\cursor-we.cur"
 
 1 ANICURSOR "res\\bounce.ani"
 
-1 BITMAP "res\\bmp.bmp"
-2 BITMAP "res\\controls.bmp"
+IDB_BMP BITMAP "res\\bmp.bmp"
+IDB_CONTROLS BITMAP "res\\controls.bmp"
 
 1 WAVE "res\\wa.wav"
 1 GIF "res\\anime.gif"

src/resource.h

@@ -22,6 +22,15 @@
 
 #define IDR_MAINFRAME           (1-0)
 
+#define IDI_MAIN                1
+#define IDI_ICO                 2
+#define IDI_SMILY               3
+#define IDI_FIND                4
+
+#define IDI_FILE                100
+#define IDI_FOLDER              101
+#define IDI_PLAY                102
+
 #define IDB_BMP                 1
 #define IDB_CONTROLS            2