X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..c626a8b797d2819e1e14110d77c04a530fd3b6b4:/include/wx/msw/dc.h

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 7e3133f0c8..29a3ca1acb 100644
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -23,6 +23,19 @@
 #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
 {
   DECLARE_ABSTRACT_CLASS(wxDC)
@@ -407,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;