added missing return on error

[wxWidgets.git] / src / generic / printps.cpp

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index 3317b1df0abc71ae91550e5b5a66c15f430c0a33..a24ea0919f3c50900f33333bc10d8998368cd837 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -45,6 +45,7 @@
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/generic/prntdlgg.h"

+#include "wx/generic/progdlgg.h"

 #include "wx/paper.h"
 
 #include <stdlib.h>
 #include "wx/paper.h"
 
 #include <stdlib.h>


@@ -53,10 +54,8 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
     IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)
     IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
     IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)

-#endif

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


@@ -81,10 +80,18 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     sm_abortWindow = (wxWindow *) NULL;
 
     if (!printout)
     sm_abortWindow = (wxWindow *) 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;


@@ -92,7 +99,10 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     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);


@@ -127,35 +137,24 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     }
     else
     {
     }
     else
     {

-        dc = new wxPostScriptDC(wxThePrintSetupData->GetPrinterFile(), FALSE, (wxWindow *) NULL);
+        dc = new wxPostScriptDC(GetPrintDialogData().GetPrintData());

     }
 
     // May have pressed cancel.
     if (!dc || !dc->Ok())
     {
         if (dc) delete dc;
     }
 
     // May have pressed cancel.
     if (!dc || !dc->Ok())
     {
         if (dc) delete dc;

+        sm_lastError = wxPRINTER_ERROR;

         return FALSE;
     }
 
         return FALSE;
     }
 

-    int logPPIScreenX = 0;
-    int logPPIScreenY = 0;
-    int logPPIPrinterX = 0;
-    int logPPIPrinterY = 0;
-
-    logPPIScreenX = 100;
-    logPPIScreenY = 100;
-
-    /*
-    // Correct values for X/PostScript?
-    logPPIPrinterX = 100;
-    logPPIPrinterY = 100;
-    */
-
-    logPPIPrinterX = 72;
-    logPPIPrinterY = 72;
+    wxSize ScreenPixels = wxGetDisplaySize();
+    wxSize ScreenMM = wxGetDisplaySizeMM();

 
 

-    printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
-    printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
+    printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
+                            (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
+    printout->SetPPIPrinter( wxPostScriptDC::GetResolution(),
+                             wxPostScriptDC::GetResolution() );

 
     // Set printout parameters
     printout->SetDC(dc);
 
     // Set printout parameters
     printout->SetDC(dc);


@@ -169,6 +168,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     // Create an abort window
     wxBeginBusyCursor();
 
     // Create an abort window
     wxBeginBusyCursor();
 

+    printout->OnPreparePrinting();
+

     int
        pagesPerCopy = m_printDialogData.GetToPage()-m_printDialogData.GetFromPage()+1,
        totalPages = pagesPerCopy * m_printDialogData.GetNoCopies(),
     int
        pagesPerCopy = m_printDialogData.GetToPage()-m_printDialogData.GetFromPage()+1,
        totalPages = pagesPerCopy * m_printDialogData.GetNoCopies(),


@@ -180,9 +181,11 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
        totalPages,
        parent,
        wxPD_CAN_ABORT|wxPD_AUTO_HIDE|wxPD_APP_MODAL);
        totalPages,
        parent,
        wxPD_CAN_ABORT|wxPD_AUTO_HIDE|wxPD_APP_MODAL);

-    
+

     printout->OnBeginPrinting();
 
     printout->OnBeginPrinting();
 

+    sm_lastError = wxPRINTER_NO_ERROR;
+

     bool keepGoing = TRUE;
 
     int copyCount;
     bool keepGoing = TRUE;
 
     int copyCount;


@@ -191,11 +194,15 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
         if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
         {
             wxEndBusyCursor();
         if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
         {
             wxEndBusyCursor();

-            wxMessageBox(_("Could not start printing."), _("Print Error"), wxOK, parent);
+            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;
         for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
 
         int pn;
         for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);


@@ -204,6 +211,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
             if (sm_abortIt)
             {
                 keepGoing = FALSE;
             if (sm_abortIt)
             {
                 keepGoing = FALSE;

+                sm_lastError = wxPRINTER_CANCELLED;

                 break;
             }
             else
                 break;
             }
             else


@@ -219,6 +227,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
                else
                {
                   sm_abortIt = TRUE;
                else
                {
                   sm_abortIt = TRUE;

+                  sm_lastError = wxPRINTER_CANCELLED;

                   keepGoing = FALSE;
                }
             }
                   keepGoing = FALSE;
                }
             }


@@ -234,7 +243,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
 
     delete dc;
 
 
     delete dc;
 

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

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


@@ -246,7 +255,14 @@ wxDC* wxPostScriptPrinter::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;
+

     dialog->Destroy();
 
     return dc;
     dialog->Destroy();
 
     return dc;


@@ -320,11 +336,16 @@ void wxPostScriptPrintPreview::DetermineScaling()
 
     if (paper)
     {
 
     if (paper)
     {

-        m_previewPrintout->SetPPIScreen(100, 100);
-        //      m_previewPrintout->SetPPIPrinter(100, 100);
-        m_previewPrintout->SetPPIPrinter(72, 72);
+        wxSize ScreenPixels = wxGetDisplaySize();
+        wxSize ScreenMM = wxGetDisplaySizeMM();
+
+        m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
+                                         (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
+        m_previewPrintout->SetPPIPrinter(wxPostScriptDC::GetResolution(), wxPostScriptDC::GetResolution()); 

 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());

+        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxPostScriptDC::GetResolution() / 72.0);
+        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxPostScriptDC::GetResolution() / 72.0);

         wxSize sizeTenthsMM(paper->GetSize());
         wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
 
         wxSize sizeTenthsMM(paper->GetSize());
         wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
 


@@ -345,7 +366,7 @@ void wxPostScriptPrintPreview::DetermineScaling()
         }
 
         // At 100%, the page should look about page-size on the screen.
         }
 
         // At 100%, the page should look about page-size on the screen.

-        m_previewScale = (float)0.8;
+        m_previewScale = (float)0.8 * 72.0 / (float)wxPostScriptDC::GetResolution();

     }
 }
 
     }
 }