VS2010 compatibility changes

nickgammon · Sep 15, 2010 · a9ec61a · a9ec61a
1 parent 347fdc1
commit a9ec61a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/dialogs/world_prefs/TreePropertySheet.h b/dialogs/world_prefs/TreePropertySheet.h
@@ -34,6 +34,11 @@ enum	{
 	tps_capborder_flow=2
 };
 
+class CTreePropertySheet : public CPropertySheet
+{
+	DECLARE_DYNAMIC(CTreePropertySheet)
+
+// Inner class CMemDC because having it outside conflicts with MSVC2008 Feature Pack and above
 class	CMemDC	: public CDC {
 public:
 	CBitmap m_MemBmp,*m_pOldBmp;
@@ -98,10 +103,6 @@ class	CMemDC	: public CDC {
     }
 };
 
-class CTreePropertySheet : public CPropertySheet
-{
-	DECLARE_DYNAMIC(CTreePropertySheet)
-
 // Subclasses
 protected:
 	class	cControlPos	{

diff --git a/winplace.cpp b/winplace.cpp
@@ -13,6 +13,7 @@
 static char BASED_CODE THIS_FILE[] = __FILE__;
 #endif
 
+#define COMPILE_MULTIMON_STUBS
 #include <MULTIMON.H>
 
 CWindowPlacement::CWindowPlacement()