Remove VC6 support

--HG--
branch : stable

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 014f377..2c3cc30 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -281,15 +281,6 @@ BOOL CMergeApp::InitInstance()
        COleMessageFilter* pOldFilter = AfxOleGetMessageFilter();
        pOldFilter->Revoke();
 
-       // 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
-
        // Load registry keys from WinMerge.reg if existing WinMerge.reg
        env_LoadRegistryFromFile(env_GetProgPath() + _T("\\WinMerge.reg"));
 

diff --git a/Src/StdAfx.h b/Src/StdAfx.h
index d750ac0..5310129 100644 (file)
--- a/Src/StdAfx.h
+++ b/Src/StdAfx.h
@@ -45,11 +45,6 @@
 
 #define VC_EXTRALEAN           // Exclude rarely-used stuff from Windows headers
 
-// Disable VC6's "identifier was truncated..." warning. It is meaningless.
-#if _MSC_VER == 1200
-       #pragma warning(disable: 4786)
-#endif
- 
 // Common MFC headers
 
 #include <afxwin.h>         // MFC core and standard components