IMHO these are the correct flags for borland

[wxWidgets.git] / src / msw / dcprint.cpp

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 96a461eaaf127b255045b6d5ed9f51fecafc886e..95fe393b286191d592ae3785e9cb4dc85d681d5c 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -27,7 +27,7 @@
 #include "wx/log.h"
 #include "math.h"
 
 #include "wx/log.h"
 #include "math.h"
 

-#include <windows.h>
+#include "wx/msw/private.h"

 
 #if wxUSE_COMMON_DIALOGS
 #include <commdlg.h>
 
 #if wxUSE_COMMON_DIALOGS
 #include <commdlg.h>


@@ -37,18 +37,6 @@
 #include <print.h>
 #endif
 
 #include <print.h>
 #endif
 

-#ifdef DrawText
-#undef DrawText
-#endif
-
-#ifdef GetCharWidth
-#undef GetCharWidth
-#endif
-
-#ifdef StartDoc
-#undef StartDoc
-#endif
-

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 #endif
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 #endif