Incomplete setup build fix.

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

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index 9a97d9cc6e232e0eb4f7501082177e09e503e6fb..e63de1fa57473e83b77a261574641cb071bd9203 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "printps.h"
 #endif
 
     #pragma implementation "printps.h"
 #endif
 


@@ -30,7 +30,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -39,6 +39,7 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/progdlg.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/progdlg.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/generic/printps.h"
 #endif
 
 #include "wx/generic/printps.h"


@@ -76,64 +77,29 @@ wxPostScriptPrinter::~wxPostScriptPrinter()
 
 bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
 
 bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {

-    sm_abortIt = FALSE;
+    sm_abortIt = false;

     sm_abortWindow = (wxWindow *) NULL;
 
     if (!printout)
     {
         sm_lastError = wxPRINTER_ERROR;
     sm_abortWindow = (wxWindow *) NULL;
 
     if (!printout)
     {
         sm_lastError = wxPRINTER_ERROR;

-        return FALSE;
+        return false;

     }
 
     }
 

-    printout->SetIsPreview(FALSE);
-
-    // 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;
-    int minPage, maxPage;
-    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
-
-    if (maxPage == 0)
-    {
-        sm_lastError = wxPRINTER_ERROR;
-        return FALSE;
-    }
-
-    m_printDialogData.SetMinPage(minPage);
-    m_printDialogData.SetMaxPage(maxPage);
-    if (fromPage != 0)
-        m_printDialogData.SetFromPage(fromPage);
-    if (toPage != 0)
-        m_printDialogData.SetToPage(toPage);
-
-    if (minPage != 0)
-    {
-        m_printDialogData.EnablePageNumbers(TRUE);
-        if (m_printDialogData.GetFromPage() < m_printDialogData.GetMinPage())
-            m_printDialogData.SetFromPage(m_printDialogData.GetMinPage());
-        else if (m_printDialogData.GetFromPage() > m_printDialogData.GetMaxPage())
-            m_printDialogData.SetFromPage(m_printDialogData.GetMaxPage());
-        if (m_printDialogData.GetToPage() > m_printDialogData.GetMaxPage())
-            m_printDialogData.SetToPage(m_printDialogData.GetMaxPage());
-        else if (m_printDialogData.GetToPage() < m_printDialogData.GetMinPage())
-            m_printDialogData.SetToPage(m_printDialogData.GetMinPage());
-    }
-    else
-        m_printDialogData.EnablePageNumbers(FALSE);
+    printout->SetIsPreview(false);

 
 

+    if (m_printDialogData.GetMinPage() < 1)
+        m_printDialogData.SetMinPage(1);
+    if (m_printDialogData.GetMaxPage() < 1)
+        m_printDialogData.SetMaxPage(9999);

 
     // Create a suitable device context
 
     // Create a suitable device context

-    wxDC *dc = (wxDC *) NULL;
+    wxDC *dc;

     if (prompt)
     {
         dc = PrintDialog(parent);
         if (!dc)
     if (prompt)
     {
         dc = PrintDialog(parent);
         if (!dc)

-            return FALSE;
+            return false;

     }
     else
     {
     }
     else
     {


@@ -145,28 +111,16 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     {
         if (dc) delete dc;
         sm_lastError = wxPRINTER_ERROR;
     {
         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 = wxPostScriptDC::GetResolution();
-    logPPIPrinterY = wxPostScriptDC::GetResolution();
+    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);


@@ -182,6 +136,28 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
 
     printout->OnPreparePrinting();
 
 
     printout->OnPreparePrinting();
 

+    // Get some parameters from the printout, if defined
+    int fromPage, toPage;
+    int minPage, maxPage;
+    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
+
+    if (maxPage == 0)
+    {
+        sm_lastError = wxPRINTER_ERROR;
+        wxEndBusyCursor();
+        return false;
+    }
+
+    // Only set min and max, because from and to have been
+    // set by the user
+    m_printDialogData.SetMinPage(minPage);
+    m_printDialogData.SetMaxPage(maxPage);
+    
+    if (m_printDialogData.GetFromPage() < minPage)
+        m_printDialogData.SetFromPage( minPage );
+    if (m_printDialogData.GetToPage() > maxPage)
+        m_printDialogData.SetToPage( maxPage );
+    

     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(),


@@ -198,7 +174,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
 
     sm_lastError = wxPRINTER_NO_ERROR;
 
 
     sm_lastError = wxPRINTER_NO_ERROR;
 

-    bool keepGoing = TRUE;
+    bool keepGoing = true;

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


@@ -222,7 +198,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
         {
             if (sm_abortIt)
             {
         {
             if (sm_abortIt)
             {

-                keepGoing = FALSE;
+                keepGoing = false;

                 sm_lastError = wxPRINTER_CANCELLED;
                 break;
             }
                 sm_lastError = wxPRINTER_CANCELLED;
                 break;
             }


@@ -238,12 +214,12 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
                }
                else
                {
                }
                else
                {

-                  sm_abortIt = TRUE;
+                  sm_abortIt = true;

                   sm_lastError = wxPRINTER_CANCELLED;
                   sm_lastError = wxPRINTER_CANCELLED;

-                  keepGoing = FALSE;
+                  keepGoing = false;

                }
             }
                }
             }

-           wxYield();
+            wxYield();

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


@@ -261,12 +237,13 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
 wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent)
 {
     wxDC* dc = (wxDC*) NULL;
 wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent)
 {
     wxDC* dc = (wxDC*) NULL;

-    wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData);
-    int ret = dialog->ShowModal() ;
-    if (ret == wxID_OK)
+    
+    wxGenericPrintDialog dialog( parent, &m_printDialogData );
+    if (dialog.ShowModal() == wxID_OK)

     {
     {

-        dc = dialog->GetPrintDC();
-        m_printDialogData = dialog->GetPrintDialogData();
+        dc = dialog.GetPrintDC();
+        m_printDialogData = dialog.GetPrintDialogData();
+        

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


@@ -275,15 +252,14 @@ wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent)
     else
         sm_lastError = wxPRINTER_CANCELLED;
 
     else
         sm_lastError = wxPRINTER_CANCELLED;
 

-    dialog->Destroy();
-

     return dc;
 }
 
     return dc;
 }
 

-bool wxPostScriptPrinter::Setup(wxWindow *parent)
+bool wxPostScriptPrinter::Setup(wxWindow *WXUNUSED(parent))

 {
 {

+#if 0

     wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData);
     wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData);

-    dialog->GetPrintDialogData().SetSetupDialog(TRUE);
+    dialog->GetPrintDialogData().SetSetupDialog(true);

 
     int ret = dialog->ShowModal();
 
 
     int ret = dialog->ShowModal();
 


@@ -293,8 +269,11 @@ bool wxPostScriptPrinter::Setup(wxWindow *parent)
     }
 
     dialog->Destroy();
     }
 
     dialog->Destroy();

-
+    

     return (ret == wxID_OK);
     return (ret == wxID_OK);

+#endif
+
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -331,7 +310,7 @@ wxPostScriptPrintPreview::~wxPostScriptPrintPreview()
 bool wxPostScriptPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)
 bool wxPostScriptPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)

-        return FALSE;
+        return false;

     wxPostScriptPrinter printer(& m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
     wxPostScriptPrinter printer(& m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }


@@ -348,9 +327,12 @@ void wxPostScriptPrintPreview::DetermineScaling()
 
     if (paper)
     {
 
     if (paper)
     {

-        m_previewPrintout->SetPPIScreen(100, 100);
-        //      m_previewPrintout->SetPPIPrinter(100, 100);
-        m_previewPrintout->SetPPIPrinter(wxPostScriptDC::GetResolution(), wxPostScriptDC::GetResolution()); 
+        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());
         sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxPostScriptDC::GetResolution() / 72.0);
 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
         sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxPostScriptDC::GetResolution() / 72.0);