X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5cb598ae2014330aaecbd19b8bbe41df2ad61911..5f5f809d57694ccca5c80245f98fe05170962194:/src/msw/printwin.cpp

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 80e1d2d484..59e6624042 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -308,6 +308,8 @@ wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
 
 bool wxWindowsPrinter::Setup(wxWindow *parent)
 {
+#if 0
+    // We no longer expose that dialog
     wxPrintDialog dialog(parent, & m_printDialogData);
     dialog.GetPrintDialogData().SetSetupDialog(true);
 
@@ -319,6 +321,9 @@ bool wxWindowsPrinter::Setup(wxWindow *parent)
     }
 
     return (ret == wxID_OK);
+#else
+    return wxID_CANCEL;
+#endif
 }
 
 /*
@@ -417,7 +422,7 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
 
     /* Process messages intended for the abort dialog box */
 
-    while (!wxPrinterBase::sm_abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
+    while (!wxPrinterBase::sm_abortIt && ::PeekMessage(&msg, 0, 0, 0, TRUE))
         if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);