PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance

diff --git a/Src/Changes.txt b/Src/Changes.txt
index eafa3ff..3b8c434 100644 (file)
--- 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 2d948a7..94f53c8 100644 (file)
--- 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();