Corrected grey scrolling windows; added C++Builder 3.0 fixes

[wxWidgets.git] / include / wx / msw / dc.h

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 7e3133f0c8d88b53cb619d297a9cc3f4de790234..bba7bd5f81dd9e4e848dc5b1ec4e81c9fbaa2303 100644 (file)
--- 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)