Index: src/ch/ch.cpp
===================================================================
diff -u -N -r1c366a50e84393bce67e50dcccc4fc5ff147db27 -r547f865c69434c14c6f16e4b529d4198f6fe2040
--- src/ch/ch.cpp	(.../ch.cpp)	(revision 1c366a50e84393bce67e50dcccc4fc5ff147db27)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision 547f865c69434c14c6f16e4b529d4198f6fe2040)
@@ -40,6 +40,15 @@
 #include "../libchengine/TConfigSerializers.h"
 #include "../libictranslate/ResourceManager.h"
 
+#define min std::min
+#define max std::max
+
+#include <afxvisualmanager.h>
+#include <afxvisualmanagerwindows.h>
+
+#undef min
+#undef max
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
@@ -368,6 +377,10 @@
 		return FALSE;
 	}
 
+	AfxEnableControlContainer();
+
+	CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));
+
 	// ================================= Shell extension ========================================
 	LOG_INFO(m_spLog) << _T("Checking shell extension compatibility");