Merge from rev.7128:7151

[winmerge-jp/winmerge-jp.git] / Src / HexMergeFrm.cpp

diff --git a/Src/HexMergeFrm.cpp b/Src/HexMergeFrm.cpp
index b3624e8..0e42dcf 100644 (file)
--- a/Src/HexMergeFrm.cpp
+++ b/Src/HexMergeFrm.cpp
@@ -25,7 +25,7 @@
  *
  */
 // ID line follows -- this is updated by SVN
-// $Id: HexMergeFrm.cpp 6653 2009-04-12 09:30:35Z jtuc $
+// $Id: HexMergeFrm.cpp 7166 2010-05-16 12:05:13Z jtuc $
 
 #include "stdafx.h"
 #include "Merge.h"
@@ -80,7 +80,6 @@ CHexMergeFrame::CHexMergeFrame()
 : m_hIdentical(NULL)
 , m_hDifferent(NULL)
 {
-       m_bActivated = FALSE;
        m_nLastSplitPos = 0;
        m_pMergeDoc = 0;
 }
@@ -235,6 +234,15 @@ void CHexMergeFrame::GetMessageString(UINT nID, CString& rMessage) const
        }
 }
 
+void CHexMergeFrame::ActivateFrame(int nCmdShow) 
+{
+       if (!GetMDIFrame()->MDIGetActive() && theApp.GetProfileInt(_T("Settings"), _T("ActiveFrameMax"), FALSE))
+       {
+               nCmdShow = SW_SHOWMAXIMIZED;
+       }
+       CMDIChildWnd::ActivateFrame(nCmdShow);
+}
+
 /**
  * @brief Save the window's position, free related resources, and destroy the window
  */