From 04a214bb60946d01563e79cd6d5e1b833c053aa3 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Wed, 12 Sep 2007 20:15:16 +0000 Subject: [PATCH] BUG: [ 1792565 ] Theming broken in 2.7.5.1 and onwards --- Src/Merge.rc | 10 ---------- Src/Merge2.rc | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Src/Merge.rc b/Src/Merge.rc index 8e243c5a7..f2fdac904 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -60,16 +60,6 @@ END #endif // APSTUDIO_INVOKED -// Include the manifest file for VC6 and VS2003.Net -#if _MSC_VER < 1400 && LANGUAGE == LANG_ENGLISH - #ifdef UNICODE - CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest" - #else - CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest" - #endif -#endif // MSC_VER - - ///////////////////////////////////////////////////////////////////////////// // // Menu diff --git a/Src/Merge2.rc b/Src/Merge2.rc index eb797316b..fbd1de3a2 100644 --- a/Src/Merge2.rc +++ b/Src/Merge2.rc @@ -3,6 +3,16 @@ // $Id$ +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + + ///////////////////////////////////////////////////////////////////////////// // // Icon -- 2.11.0