More small fixes

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index cfd271d228ec8ba011d9c5284f0ee43b194ca431..b159af65f90bd6f91d8f3517fc7d73e25c273c61 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -30,26 +30,29 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifndef WX_PRECOMP
 #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/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"
 #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 "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>
 
 #ifndef __WIN32__
     #include <print.h>


@@ -65,10 +68,8 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 // wxWin macros
 // ---------------------------------------------------------------------------
 
 // wxWin macros
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
     IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
     IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)

-#endif

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -86,7 +87,11 @@ wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
 
 wxWindowsPrinter::~wxWindowsPrinter()
 {
 
 wxWindowsPrinter::~wxWindowsPrinter()
 {

+    // avoids warning about statement with no effect (FreeProcInstance
+       // doesn't do anything under Win32)
+#if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(__NT__) && !defined(__GNUWIN32__)

     FreeProcInstance((FARPROC) m_lpAbortProc);
     FreeProcInstance((FARPROC) m_lpAbortProc);

+#endif

 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)


@@ -95,10 +100,17 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     sm_abortWindow = NULL;
 
     if (!printout)
     sm_abortWindow = NULL;
 
     if (!printout)

+    {
+        sm_lastError = wxPRINTER_ERROR;

         return FALSE;
         return FALSE;

+    }

 
     printout->SetIsPreview(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;
 
     // Get some parameters from the printout, if defined
     int fromPage, toPage;


@@ -106,7 +118,10 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
 
     if (maxPage == 0)
     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
 
     if (maxPage == 0)

+    {
+        sm_lastError = wxPRINTER_ERROR;

         return FALSE;
         return FALSE;

+    }

 
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
 
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);


@@ -166,6 +181,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;

+        sm_lastError = wxPRINTER_ERROR;

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -185,11 +201,17 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     // Create an abort window
     wxBeginBusyCursor();
 
     // Create an abort window
     wxBeginBusyCursor();
 

+    printout->OnPreparePrinting();
+

     wxWindow *win = CreateAbortWindow(parent, printout);
     wxYield();
 
 #if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
     wxWindow *win = CreateAbortWindow(parent, printout);
     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);
     ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) m_lpAbortProc);

+#endif

 #else
     ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
         // cast it to right type only if required
 #else
     ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
         // cast it to right type only if required


@@ -206,7 +228,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (!win)
     {
         wxEndBusyCursor();
     if (!win)
     {
         wxEndBusyCursor();

-        wxLogDebug("Could not create an abort dialog.");
+        wxLogDebug(wxT("Could not create an abort dialog."));
+        sm_lastError = wxPRINTER_ERROR;

 
         delete dc;
     }
 
         delete dc;
     }


@@ -216,36 +239,48 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     printout->OnBeginPrinting();
 
 
     printout->OnBeginPrinting();
 

-    bool keepGoing = TRUE;
+    sm_lastError = wxPRINTER_NO_ERROR;

 
     int copyCount;
 
     int copyCount;

-    for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)
+    for ( copyCount = 1;
+          copyCount <= m_printDialogData.GetNoCopies();
+          copyCount++ )

     {
         if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
         {
             wxEndBusyCursor();
             wxLogError(_("Could not start printing."));
     {
         if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
         {
             wxEndBusyCursor();
             wxLogError(_("Could not start printing."));

+            sm_lastError = wxPRINTER_ERROR;

             break;
         }
         if (sm_abortIt)
             break;
         }
         if (sm_abortIt)

+        {
+            sm_lastError = wxPRINTER_CANCELLED;

             break;
             break;

+        }

 
         int pn;
 
         int pn;

-        for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
-        pn++)
+        for ( pn = m_printDialogData.GetFromPage();
+              pn <= m_printDialogData.GetToPage() && printout->HasPage(pn);
+              pn++ )

         {
         {

-            if (sm_abortIt)
+            if ( sm_abortIt )

             {
             {

-                keepGoing = FALSE;
+                sm_lastError = wxPRINTER_CANCELLED;

                 break;
             }
                 break;
             }

-            else
+
+            dc->StartPage();
+            bool cont = printout->OnPrintPage(pn);
+            dc->EndPage();
+
+            if ( !cont )

             {
             {

-                dc->StartPage();
-                printout->OnPrintPage(pn);
-                dc->EndPage();
+                sm_lastError = wxPRINTER_CANCELLED;
+                break;

             }
         }
             }
         }

+

         printout->OnEndDocument();
     }
 
         printout->OnEndDocument();
     }
 


@@ -262,7 +297,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     delete dc;
 
 
     delete dc;
 

-    return TRUE;
+    return (sm_lastError == wxPRINTER_NO_ERROR);

 }
 
 wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
 }
 
 wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)


@@ -276,7 +311,13 @@ wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
     {
         dc = dialog.GetPrintDC();
         m_printDialogData = dialog.GetPrintDialogData();
     {
         dc = dialog.GetPrintDC();
         m_printDialogData = dialog.GetPrintDialogData();

+        if (dc == NULL)
+            sm_lastError = wxPRINTER_ERROR;
+        else
+            sm_lastError = wxPRINTER_NO_ERROR;

     }
     }

+    else
+        sm_lastError = wxPRINTER_CANCELLED;

 
     return dc;
 }
 
     return dc;
 }


@@ -404,3 +445,5 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
         return (!wxPrinterBase::sm_abortIt);
 }
 
         return (!wxPrinterBase::sm_abortIt);
 }
 

+#endif
+    // wxUSE_PRINTING_ARCHITECTURE