Added GSocket_Select() and fixed some things

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 36beaf602138863e26a0f5b566feee454669538d..b4fa85248ee4089920fb40b63b3f3c56ab81907b 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -99,7 +99,11 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         return FALSE;
 
     printout->SetIsPreview(FALSE);
-    printout->OnPreparePrinting();
+
+    // 4/9/99, JACS: this is a silly place to allow preparation, considering
+    // the DC and no parameters have been set in the printout object.
+    // Moved further down.
+    // printout->OnPreparePrinting();
 
     // Get some parameters from the printout, if defined
     int fromPage, toPage;
@@ -186,6 +190,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     // Create an abort window
     wxBeginBusyCursor();
 
+    printout->OnPreparePrinting();
+
     wxWindow *win = CreateAbortWindow(parent, printout);
     wxYield();
 
@@ -211,7 +217,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;
     }