Oops, I didn't see Robert had already corrected 16bit BMP typo

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index d304d8bbc92468424c62cbb9ee96a05ef2b34dc9..95fe393b286191d592ae3785e9cb4dc85d681d5c 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -24,9 +24,10 @@
 #endif
 
 #include "wx/dcprint.h"
 #endif
 
 #include "wx/dcprint.h"

+#include "wx/log.h"

 #include "math.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>


@@ -36,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


@@ -194,7 +183,7 @@ bool wxPrinterDC::StartDoc(const wxString& message)
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();

-        wxDebugMsg("wxDC::StartDoc failed with error: %d\n", lastError);
+        wxLogDebug("wxDC::StartDoc failed with error: %d\n", lastError);

     }
 #endif
     
     }
 #endif