X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/518f33a4e50585cab19757375a2c348e61d2594f..89c684ef8280e2d91096da2d96ba36e24a1fb917:/include/wx/msw/dc.h

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 7d101628e6..29a3ca1acb 100644
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -21,6 +21,20 @@
 #include "wx/icon.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
+#include "wx/window.h"
+
+// Clash with Windows header files
+#ifdef StartDoc
+#undef StartDoc
+#endif
+
+#ifdef DrawText
+#undef DrawText
+#endif
+
+#ifdef GetCharWidth
+#undef GetCharWidth
+#endif
 
 class WXDLLEXPORT wxDC: public wxObject
 {
@@ -406,8 +420,8 @@ protected:
 #define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
 #define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
 
-#define MM_POINTS      7
-#define MM_METRIC      8
+#define MM_POINTS      9
+#define MM_METRIC     10
 
 extern int wxPageNumber;