X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/103aec296a2c017f915b4b2b2584191fdb716a75..7d4194184e83bbccf1a88325cca59d8d0d2faef1:/src/msw/printwin.cpp

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index cfd271d228..4034697c85 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -31,25 +31,26 @@
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/msw/private.h"
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
+    #include "wx/intl.h"
 #endif
 
 #include "wx/msw/printwin.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
+#include "wx/log.h"
 #include "wx/msw/private.h"
 
 #include <stdlib.h>
-#include <windows.h>
-#include <commdlg.h>
 
-// Clash with Windows header files
-#ifdef StartDoc
-    #undef StartDoc
-#endif
+#include "wx/msw/private.h"
+
+#include <commdlg.h>
 
 #ifndef __WIN32__
     #include <print.h>
@@ -189,7 +190,11 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     wxYield();
 
 #if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
+#ifdef STRICT
+    ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
+#else
     ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) m_lpAbortProc);
+#endif
 #else
     ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
         // cast it to right type only if required
@@ -206,7 +211,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (!win)
     {
         wxEndBusyCursor();
-        wxLogDebug("Could not create an abort dialog.");
+        wxLogDebug(_T("Could not create an abort dialog."));
 
         delete dc;
     }