merge upstream patch for wtl to compile on vs2012

third_party/wtl/include/atlapp.h

Index: third_party/wtl/include/atlapp.h
diff --git a/third_party/wtl/include/atlapp.h b/third_party/wtl/include/atlapp.h
index ca424ebd4b699b174bbf9ccd6888ddbf61826e44..4a5e6a7064a85ab2f3715ce9781f6afe22b684d2 100644
--- a/third_party/wtl/include/atlapp.h
+++ b/third_party/wtl/include/atlapp.h
@@ -457,8 +457,8 @@ static CWndClassInfo& GetWndClassInfo() \
   #endif // ATLVERIFY
 #endif // (_ATL_VER < 0x0700)
 
-// Forward declaration for ATL3 fix
-#if (_ATL_VER < 0x0700) && defined(_ATL_DLL) && !defined(_WIN32_WCE)
+// Forward declaration for ATL3 and ATL11 fix
+#if (((_ATL_VER < 0x0700) && defined(_ATL_DLL)) || (_ATL_VER >= 0x0B00)) && !defined(_WIN32_WCE)
   namespace ATL { HRESULT AtlGetCommCtrlVersion(LPDWORD pdwMajor, LPDWORD pdwMinor); };
 #endif
 
@@ -1572,9 +1572,10 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// General DLL version helpers (excluded from atlbase.h if _ATL_DLL is defined)
+// General DLL version helpers
+// (ATL3: excluded from atlbase.h if _ATL_DLL is defined; ATL11: removed)
 
-#if (_ATL_VER < 0x0700) && defined(_ATL_DLL) && !defined(_WIN32_WCE)
+#if (((_ATL_VER < 0x0700) && defined(_ATL_DLL)) || (_ATL_VER >= 0x0B00)) && !defined(_WIN32_WCE)
 
 namespace ATL
 {