MainFrm.cpp: Make it so that the parent window cannot be operated while the font...

diff --git a/Docs/Users/ChangeLog.html b/Docs/Users/ChangeLog.html
index 43e8703..02981db 100644 (file)
--- a/Docs/Users/ChangeLog.html
+++ b/Docs/Users/ChangeLog.html
@@ -26,6 +26,7 @@
 <ul>
 <li>[Feature Request] Lengthen title of File Compare window or add tip (#960)</li>
 <li>added me to contributor list (PR #1094)</li>
+<li>Made so that the parent window cannot be operated while the font selection dialog displayed from View→Select Font menu item is displayed.</li>
 </ul>
 <h3 id="file-compare">File compare</h3>
 <ul>

diff --git a/Docs/Users/ChangeLog.md b/Docs/Users/ChangeLog.md
index 2615544..ca21944 100644 (file)
--- a/Docs/Users/ChangeLog.md
+++ b/Docs/Users/ChangeLog.md
@@ -6,6 +6,8 @@
 
 - [Feature Request] Lengthen title of File Compare window or add tip (#960)
 - added me to contributor list (PR #1094)
+- Made so that the parent window cannot be operated while the font selection
+    dialog displayed from View→Select Font menu item is displayed.
 
 ### File compare
 

diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index f3e0fff..30b60c2 100644 (file)
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -36,6 +36,7 @@
 <ul>
 <li>[Feature Request] Lengthen title of File Compare window or add tip (#960)</li>
 <li>added me to contributor list (PR #1094)</li>
+<li>Made so that the parent window cannot be operated while the font selection dialog displayed from View→Select Font menu item is displayed.</li>
 </ul>
 <h3 id="file-compare">File compare</h3>
 <ul>

diff --git a/Docs/Users/ReleaseNotes.md b/Docs/Users/ReleaseNotes.md
index 2d76b36..fb8887e 100644 (file)
--- a/Docs/Users/ReleaseNotes.md
+++ b/Docs/Users/ReleaseNotes.md
@@ -20,6 +20,8 @@ Please submit bug reports to our <a href="http://github.com/WinMerge/winmerge/is
 
 - [Feature Request] Lengthen title of File Compare window or add tip (#960)
 - added me to contributor list (PR #1094)
+- Made so that the parent window cannot be operated while the font selection
+    dialog displayed from View→Select Font menu item is displayed.
 
 ### File compare
 

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 8ca8f5a..742ec70 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1406,6 +1406,7 @@ void CMainFrame::OnViewSelectfont()
                lf = &m_lfDiff;
 
        cf.lpLogFont = lf;
+       cf.hwndOwner = m_hWnd;
 
        if (ChooseFont(&cf))
        {