From 88fe168b5ac5522af41cdeec8df10a1f51a4f036 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Sun, 2 Oct 2005 23:54:45 +0000 Subject: [PATCH] PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance --- Src/Changes.txt | 2 ++ Src/Merge.cpp | 11 ++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index eafa3ffad..3b8c4349f 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -1,6 +1,8 @@ 2005-10-02 Perry PATCH: [ 1253949 ] cosmetic comment fix Src: DiffItem.h + PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance + Src: Merge.cpp 2005-10-02 Jochen Merge7z DllBuild 0015 diff --git a/Src/Merge.cpp b/Src/Merge.cpp index 2d948a78f..94f53c857 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -273,15 +273,8 @@ BOOL CMergeApp::InitInstance() CMenu * pNewMenu = CMenu::FromHandle(pMainFrame->m_hMenuDefault); pMainFrame->MDISetMenu(pNewMenu, NULL); - // Parse command line for standard shell commands, DDE, file open - //CCommandLineInfo cmdInfo; - //ParseCommandLine(cmdInfo); - - /* Dispatch commands specified on the command line - if( cmdInfo.m_nShellCommand == CCommandLineInfo::FileNew ) - cmdInfo.m_nShellCommand = CCommandLineInfo::FileNothing; - if (!ProcessShellCommand(cmdInfo)) - return FALSE;*/ + // Command line parsing is handled not by MFC wizard's CComandLineInfo + // but rather by ParseArgsAndDoOpen below //Track it so any other instances can find it. instanceChecker.TrackFirstInstanceRunning(); -- 2.11.0