Permalink
Browse files

VS2010 compatibility changes

  • Loading branch information...
1 parent 347fdc1 commit a9ec61a6efd3fc629ea573a657aabbd2290ef504 @worstje worstje committed Sep 15, 2010
Showing with 6 additions and 4 deletions.
  1. +5 −4 dialogs/world_prefs/TreePropertySheet.h
  2. +1 −0 winplace.cpp
@@ -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 {
View
@@ -13,6 +13,7 @@
static char BASED_CODE THIS_FILE[] = __FILE__;
#endif
+#define COMPILE_MULTIMON_STUBS
#include <MULTIMON.H>
CWindowPlacement::CWindowPlacement()

0 comments on commit a9ec61a

Please sign in to comment.