From 7ac1f09d8b9b0b05bc95fba90c2e954ffa099a49 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Thu, 27 Nov 2014 16:26:03 +0900 Subject: [PATCH] Use <=8bit toolbar bitmap to avoid an assertion on VS2013 debug build --HG-- branch : stable --- Src/Merge2.rc | 1 + Src/res/ToolbarDummy.bmp | Bin 0 -> 722 bytes Src/resource.h | 3 ++- Translations/WinMerge/English.pot | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Src/res/ToolbarDummy.bmp diff --git a/Src/Merge2.rc b/Src/Merge2.rc index 6450074ed..4da7dea78 100644 --- a/Src/Merge2.rc +++ b/Src/Merge2.rc @@ -116,6 +116,7 @@ IDR_LOGO IMAGE "res\\logo.jpg" // Bitmap // +IDB_TOOLBAR_DUMMY BITMAP "res\\ToolbarDummy.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/ToolbarDummy.bmp new file mode 100644 index 0000000000000000000000000000000000000000..95a0d000e5f6a5101a51faa5c0559ba071a51260 GIT binary patch literal 722 zcmZ?ry~M--26jMF1BeqC85sD1G$Rm#z!aeTVLk{33qXng|NkR%N7#n AaR2}S literal 0 HcmV?d00001 diff --git a/Src/resource.h b/Src/resource.h index d7dbb7859..4459bc66c 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -3,7 +3,7 @@ // Used by Merge.rc // #define IDR_MAINFRAME 100 -#define IDB_TOOLBAR_ENABLED 100 // = IDR_MAINFRAME +#define IDB_TOOLBAR_DUMMY 100 // = IDR_MAINFRAME #define IDR_MERGEPROJECT 101 #define IDR_POPUP_EDITOR_HEADERBAR 102 #define IDR_POPUP_PLUGINS_SETTINGS 103 @@ -116,6 +116,7 @@ #define IDB_MERGE_COMPARE_LEFT2_RIGHT1 367 #define IDB_COPY_FROM_LEFT 368 #define IDB_COPY_FROM_RIGHT 369 +#define IDB_TOOLBAR_ENABLED 370 #define IDI_FOLDER 500 #define IDI_LFOLDER 501 #define IDI_MFOLDER 601 diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 6e1d11dac..f01deada2 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2014-11-26 22:05+0000\n" +"POT-Creation-Date: 2014-11-27 14:30+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" -- 2.11.0