From f6c83ec59879cf6d9ae8e7c3a9fc54481b4709db Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 11 Feb 2009 20:41:50 +0000 Subject: [PATCH] PATCH: [ 2590079 ] Make help window non-modal for WinMerge window --- Docs/Users/ChangeLog.txt | 1 + Src/MainFrm.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 18e2e86ec..b9e71ccf0 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -7,6 +7,7 @@ WinMerge 2.13.3 Use three-digit version numbers in GUI (#2585662) Bugfix: Could not copy files from right to left (#2556904) Bugfix: Don't show file name extension for folders (#2563314) + Bugfix: Help window opened from WinMerge was modal (#2590079) Translation updates: - French (#2551043, #2551066) - German (#2586497) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 03754d9c0..853179a55 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -1690,7 +1690,7 @@ void CMainFrame::OnHelpContents() { String sPath = GetModulePath(0) + DocsPath; if (paths_DoesPathExist(sPath.c_str()) == IS_EXISTING_FILE) - ::HtmlHelp(GetSafeHwnd(), sPath.c_str(), HH_DISPLAY_TOC, NULL); + ::HtmlHelp(NULL, sPath.c_str(), HH_DISPLAY_TOC, NULL); else ShellExecute(NULL, _T("open"), DocsURL, NULL, NULL, SW_SHOWNORMAL); } @@ -2720,7 +2720,7 @@ void CMainFrame::ShowHelp(LPCTSTR helpLocation /*= NULL*/) if (paths_DoesPathExist(sPath.c_str()) == IS_EXISTING_FILE) { sPath += helpLocation; - ::HtmlHelp(GetSafeHwnd(), sPath.c_str(), HH_DISPLAY_TOPIC, NULL); + ::HtmlHelp(NULL, sPath.c_str(), HH_DISPLAY_TOPIC, NULL); } } } -- 2.11.0