From 72142a6c421dc541841feb83592393c2e9ebc7d6 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Fri, 28 Nov 2014 23:32:26 +0900 Subject: [PATCH] Rename ToolbarDummy.bmp to ToolbarEnabled8bit.bmp --HG-- branch : stable --- Src/Merge2.rc | 2 +- Src/res/{ToolbarDummy.bmp => ToolbarEnabled8bit.bmp} | Bin Src/resource.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename Src/res/{ToolbarDummy.bmp => ToolbarEnabled8bit.bmp} (100%) diff --git a/Src/Merge2.rc b/Src/Merge2.rc index 4da7dea78..df46e13e0 100644 --- a/Src/Merge2.rc +++ b/Src/Merge2.rc @@ -116,7 +116,7 @@ IDR_LOGO IMAGE "res\\logo.jpg" // Bitmap // -IDB_TOOLBAR_DUMMY BITMAP "res\\ToolbarDummy.bmp" +IDB_TOOLBAR_ENABLED8BIT BITMAP "res\\ToolbarEnabled8bit.bmp" IDB_TOOLBAR_ENABLED BITMAP "res\\ToolbarEnabled.bmp" IDB_TOOLBAR_DISABLED BITMAP "res\\ToolbarDisabled.bmp" IDB_EDIT_COPY BITMAP "res\\copy.bmp" diff --git a/Src/res/ToolbarDummy.bmp b/Src/res/ToolbarEnabled8bit.bmp similarity index 100% rename from Src/res/ToolbarDummy.bmp rename to Src/res/ToolbarEnabled8bit.bmp diff --git a/Src/resource.h b/Src/resource.h index 4459bc66c..0246ba4ae 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -3,7 +3,7 @@ // Used by Merge.rc // #define IDR_MAINFRAME 100 -#define IDB_TOOLBAR_DUMMY 100 // = IDR_MAINFRAME +#define IDB_TOOLBAR_ENABLED8BIT 100 // = IDR_MAINFRAME #define IDR_MERGEPROJECT 101 #define IDR_POPUP_EDITOR_HEADERBAR 102 #define IDR_POPUP_PLUGINS_SETTINGS 103 -- 2.11.0