From bb10b4acf5f7d0ba928574f8a6e0f11d5b737d9f Mon Sep 17 00:00:00 2001 From: sdottaka Date: Sun, 23 May 2010 22:54:21 +0900 Subject: [PATCH] Fix merge mistake --- Src/HexMergeFrm.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Src/HexMergeFrm.cpp b/Src/HexMergeFrm.cpp index d4a630f86..0e42dcf2e 100644 --- a/Src/HexMergeFrm.cpp +++ b/Src/HexMergeFrm.cpp @@ -243,15 +243,6 @@ void CHexMergeFrame::ActivateFrame(int nCmdShow) CMDIChildWnd::ActivateFrame(nCmdShow); } -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 */ -- 2.11.0