Revert "To reduce the size of the executable file, convert the image "ToolbarEnabled8...

This reverts commit a630c53b7fa46c087b6f71c5a0ca35e6c1862257.

diff --git a/Src/Merge2.rc b/Src/Merge2.rc
index 0320aba..da236ad 100644 (file)
--- a/Src/Merge2.rc
+++ b/Src/Merge2.rc
@@ -119,7 +119,7 @@ IDR_MARGIN_ICONS_PNG    IMAGE                   "res\\mg_icons.png"
 // Bitmap
 //
 
-IDB_TOOLBAR_DUMMY       BITMAP                  "res\\ToolbarDummy.bmp"
+IDB_TOOLBAR_ENABLED8BIT BITMAP                  "res\\ToolbarEnabled8bit.bmp"
 IDB_TOOLBAR_ENABLED     BITMAP                  "res\\ToolbarEnabled.bmp"
 IDB_TOOLBAR_ENABLED32   BITMAP                  "res\\ToolbarEnabled32.bmp"
 IDB_EDIT_COPY           BITMAP                  "res\\copy.bmp"

diff --git a/Src/res/ToolbarDummy.bmp b/Src/res/ToolbarDummy.bmp
deleted file mode 100644 (file)
index ade1b59..0000000
Binary files a/Src/res/ToolbarDummy.bmp and /dev/null differ

diff --git a/Src/res/ToolbarEnabled8bit.bmp b/Src/res/ToolbarEnabled8bit.bmp
new file mode 100644 (file)
index 0000000..fd6d1b1
Binary files /dev/null and b/Src/res/ToolbarEnabled8bit.bmp differ

diff --git a/Src/resource.h b/Src/resource.h
index a25141e..a9b40f8 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -3,7 +3,7 @@
 // Used by Merge.rc\r
 //\r
 #define IDR_MAINFRAME                   100\r
-#define IDB_TOOLBAR_DUMMY               100\r
+#define IDB_TOOLBAR_ENABLED8BIT         100\r
 #define IDR_MERGEPROJECT                101\r
 #define IDR_POPUP_EDITOR_HEADERBAR      102\r
 #define IDR_POPUP_PLUGINS_SETTINGS      103\r