Quiet warning about deprecated function for VS2003 and later

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 1970e40..9100e8a 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,10 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-07-09 Kimmo
+ Quiet warning about deprecated function for VS2003 and later
+  Merge.cpp
+
 2006-07-08 Kimmo
  PATCH: [ 1517362 ] Ensure diff is visible in location view
   Src: LocationView.cpp

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 9661b2f..a53318a 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -150,11 +150,14 @@ BOOL CMergeApp::InitInstance()
        //  of your final executable, you should remove from the following
        //  the specific initialization routines you do not need.
 
+       // Only needed by VC6
+#if _MSC_VER < 1300
 #ifdef _AFXDLL
        Enable3dControls();                     // Call this when using MFC in a shared DLL
 #else
        Enable3dControlsStatic();       // Call this when linking to MFC statically
 #endif
+#endif
 
        // Set default codepage
        DirScan_InitializeDefaultCodepage();