removed 2nd frame from html test sample; test sample now shows DL,DT,DD support

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

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index ea2d5985038b898b9dbcd042cef9e2996dc8776c..0e994766b9cb1e8daa4ff739786754f5209b0dc6 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -6,260 +6,353 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "printps.h"
+    #pragma implementation "printps.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #include "wx/defs.h"
 
 #endif
 
 #include "wx/defs.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/dc.h"
-#include "wx/app.h"
-#include "wx/msgdlg.h"
-#include <wx/intl.h>
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/app.h"
+    #include "wx/msgdlg.h"
+    #include "wx/intl.h"
+    #include "wx/progdlg.h"

 #endif
 
 #include "wx/generic/printps.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/generic/prntdlgg.h"
 #endif
 
 #include "wx/generic/printps.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 <stdlib.h>
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)
-#endif
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+    IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
+    IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// Printer
+// ----------------------------------------------------------------------------

 
 

-/*
- * Printer
- */
- 
-wxPostScriptPrinter::wxPostScriptPrinter(wxPrintData *data):
-    wxPrinterBase(data)
+wxPostScriptPrinter::wxPostScriptPrinter(wxPrintDialogData *data)
+                   : wxPrinterBase(data)

 {
 }
 
 {
 }
 

-wxPostScriptPrinter::~wxPostScriptPrinter(void)
+wxPostScriptPrinter::~wxPostScriptPrinter()

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

-  abortIt = FALSE;
-  abortWindow = (wxWindow *) NULL;
-
-  if (!printout)
-    return FALSE;
-    
-  printout->SetIsPreview(FALSE);
-  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)
-    return FALSE;
-
-  printData.SetMinPage(minPage);
-  printData.SetMaxPage(maxPage);
-  if (fromPage != 0)
-    printData.SetFromPage(fromPage);
-  if (toPage != 0)
-    printData.SetToPage(toPage);
-
-  if (minPage != 0)
-  {
-    printData.EnablePageNumbers(TRUE);
-    if (printData.GetFromPage() < printData.GetMinPage())
-      printData.SetFromPage(printData.GetMinPage());
-    else if (printData.GetFromPage() > printData.GetMaxPage())
-      printData.SetFromPage(printData.GetMaxPage());
-    if (printData.GetToPage() > printData.GetMaxPage())
-      printData.SetToPage(printData.GetMaxPage());
-    else if (printData.GetToPage() < printData.GetMinPage())
-      printData.SetToPage(printData.GetMinPage());
-  }
-  else
-    printData.EnablePageNumbers(FALSE);
-  
-  // Create a suitable device context  
-  wxDC *dc = (wxDC *) NULL;
-  if (prompt)
-  {
-     wxGenericPrintDialog dialog(parent, & printData);
-     if (dialog.ShowModal() == wxID_OK)
-     {
-       dc = dialog.GetPrintDC();
-       printData = dialog.GetPrintData();
-     }
-  }
-  else
-  {
-     dc = new wxPostScriptDC(wxThePrintSetupData->GetPrinterFile(), FALSE, (wxWindow *) NULL);
-  }
-
-  // May have pressed cancel.
-  if (!dc || !dc->Ok())
-  {
-    if (dc) delete dc;
-    return FALSE;
-  }
-  
-  int logPPIScreenX = 0;
-  int logPPIScreenY = 0;
-  int logPPIPrinterX = 0;
-  int logPPIPrinterY = 0;
-
-  // Correct values for X/PostScript?
-  logPPIScreenX = 100;
-  logPPIScreenY = 100;
-  logPPIPrinterX = 100;
-  logPPIPrinterY = 100;
-
-  printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
-  printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
-
-  // Set printout parameters  
-  printout->SetDC(dc);
-
-  int w, h;
-  long ww, hh;
-  dc->GetSize(&w, &h);
-  printout->SetPageSizePixels((int)w, (int)h);
-  dc->GetSizeMM(&ww, &hh);
-  printout->SetPageSizeMM((int)ww, (int)hh);
-
-  // Create an abort window
-  wxBeginBusyCursor();
-
-  printout->OnBeginPrinting();
-  
-  bool keepGoing = TRUE;
-
-  int copyCount;
-  for (copyCount = 1; copyCount <= printData.GetNoCopies(); copyCount ++)
-  {
-    if (!printout->OnBeginDocument(printData.GetFromPage(), printData.GetToPage()))
+    sm_abortIt = FALSE;
+    sm_abortWindow = (wxWindow *) NULL;
+
+    if (!printout)
+        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)
+        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);
+
+
+    // Create a suitable device context
+    wxDC *dc = (wxDC *) NULL;
+    if (prompt)
+    {
+        dc = PrintDialog(parent);
+        if (!dc)
+            return FALSE;
+    }
+    else

     {
     {

-      wxEndBusyCursor();
-      wxMessageBox(_("Could not start printing."), _("Print Error"), wxOK, parent);
-      break;
+        dc = new wxPostScriptDC(wxThePrintSetupData->GetPrinterFile(), FALSE, (wxWindow *) NULL);

     }
     }

-    if (abortIt)
-      break;

 
 

-    int pn;
-    for (pn = printData.GetFromPage(); keepGoing && (pn <= printData.GetToPage()) && printout->HasPage(pn);
-         pn++)
+    // May have pressed cancel.
+    if (!dc || !dc->Ok())
+    {
+        if (dc) delete dc;
+        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;
+
+    printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
+    printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
+
+    // Set printout parameters
+    printout->SetDC(dc);
+
+    int w, h;
+    dc->GetSize(&w, &h);
+    printout->SetPageSizePixels((int)w, (int)h);
+    dc->GetSizeMM(&w, &h);
+    printout->SetPageSizeMM((int)w, (int)h);
+
+    // Create an abort window
+    wxBeginBusyCursor();
+
+    printout->OnPreparePrinting();
+
+    int
+       pagesPerCopy = m_printDialogData.GetToPage()-m_printDialogData.GetFromPage()+1,
+       totalPages = pagesPerCopy * m_printDialogData.GetNoCopies(),
+       printedPages = 0;
+    // Open the progress bar dialog
+    wxProgressDialog *progressDialog = new wxProgressDialog (
+       printout->GetTitle(),
+       _("Printing..."),
+       totalPages,
+       parent,
+       wxPD_CAN_ABORT|wxPD_AUTO_HIDE|wxPD_APP_MODAL);
+
+    printout->OnBeginPrinting();
+
+    bool keepGoing = TRUE;
+
+    int copyCount;
+    for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)

     {
     {

-      if (abortIt)
-      {
-        keepGoing = FALSE;
-        break;
-      }
-      else
-      {
-        dc->StartPage();
-        printout->OnPrintPage(pn);
-        dc->EndPage();
-      }
+        if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+        {
+            wxEndBusyCursor();
+            wxMessageBox(_("Could not start printing."), _("Print Error"), wxOK, parent);
+            break;
+        }
+        if (sm_abortIt)
+            break;
+
+        int pn;
+        for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
+        pn++)
+        {
+            if (sm_abortIt)
+            {
+                keepGoing = FALSE;
+                break;
+            }
+            else
+            {
+               wxString msg;
+               msg.Printf(_("Printing page %d..."), printedPages+1);
+               if(progressDialog->Update(printedPages++, msg))
+               {
+                  dc->StartPage();
+                  printout->OnPrintPage(pn);
+                  dc->EndPage();
+               }
+               else
+               {
+                  sm_abortIt = TRUE;
+                  keepGoing = FALSE;
+               }
+            }
+           wxYield();
+        }
+        printout->OnEndDocument();

     }
     }

-    printout->OnEndDocument();
-  }

 
 

-  printout->OnEndPrinting();
+    printout->OnEndPrinting();
+    delete progressDialog;

 
 

-  wxEndBusyCursor();
+    wxEndBusyCursor();

 
 

-  delete dc;
-  
-  return TRUE;
+    delete dc;
+
+    return TRUE;

 }
 
 }
 

-bool wxPostScriptPrinter::PrintDialog(wxWindow *parent)
+wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent)

 {
 {

-    wxGenericPrintDialog dialog(parent, & printData);
-    return (dialog.ShowModal() == wxID_OK);
+    wxDC* dc = (wxDC*) NULL;
+    wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData);
+    int ret = dialog->ShowModal() ;
+    if (ret == wxID_OK)
+    {
+        dc = dialog->GetPrintDC();
+        m_printDialogData = dialog->GetPrintDialogData();
+    }
+    dialog->Destroy();
+
+    return dc;

 }
 
 bool wxPostScriptPrinter::Setup(wxWindow *parent)
 {
 }
 
 bool wxPostScriptPrinter::Setup(wxWindow *parent)
 {

-    wxGenericPrintDialog dialog(parent, & printData);
-    dialog.GetPrintData().SetSetupDialog(TRUE);
-    return (dialog.ShowModal() == wxID_OK);
+    wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData);
+    dialog->GetPrintDialogData().SetSetupDialog(TRUE);
+
+    int ret = dialog->ShowModal();
+
+    if (ret == wxID_OK)
+    {
+        m_printDialogData = dialog->GetPrintDialogData();
+    }
+
+    dialog->Destroy();
+
+    return (ret == wxID_OK);

 }
 
 }
 

-/*
- * Print preview
- */
+// ----------------------------------------------------------------------------
+// Print preview
+// ----------------------------------------------------------------------------

 
 

-wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
-  wxPrintPreviewBase(printout, printoutForPrinting, data)
+void wxPostScriptPrintPreview::Init(wxPrintout * WXUNUSED(printout),
+                                    wxPrintout * WXUNUSED(printoutForPrinting))

 {
 {

-  // Have to call it here since base constructor can't call it
-  DetermineScaling();
+    // Have to call it here since base constructor can't call it
+    DetermineScaling();

 }
 
 }
 

-wxPostScriptPrintPreview::~wxPostScriptPrintPreview(void)
+wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout *printout,
+                                                   wxPrintout *printoutForPrinting,
+                                                   wxPrintDialogData *data)
+                        : wxPrintPreviewBase(printout, printoutForPrinting, data)
+{
+    Init(printout, printoutForPrinting);
+}
+
+wxPostScriptPrintPreview::wxPostScriptPrintPreview(wxPrintout *printout,
+                                                   wxPrintout *printoutForPrinting,
+                                                   wxPrintData *data)
+                        : wxPrintPreviewBase(printout, printoutForPrinting, data)
+{
+    Init(printout, printoutForPrinting);
+}
+
+wxPostScriptPrintPreview::~wxPostScriptPrintPreview()

 {
 }
 
 bool wxPostScriptPrintPreview::Print(bool interactive)
 {
 {
 }
 
 bool wxPostScriptPrintPreview::Print(bool interactive)
 {

-  if (!printPrintout)
-    return FALSE;
-  wxPostScriptPrinter printer(&printData);
-  return printer.Print(previewFrame, printPrintout, interactive);
+    if (!m_printPrintout)
+        return FALSE;
+    wxPostScriptPrinter printer(& m_printDialogData);
+    return printer.Print(m_previewFrame, m_printPrintout, interactive);

 }
 
 }
 

-void wxPostScriptPrintPreview::DetermineScaling(void)
+void wxPostScriptPrintPreview::DetermineScaling()

 {
 {

-    const char *paperType = wxThePrintSetupData->GetPaperName();
-    if (!paperType)
-      paperType = _("A4 210 x 297 mm");
+    wxPaperSize paperType = m_printDialogData.GetPrintData().GetPaperId();
+    if (paperType == wxPAPER_NONE)
+        paperType = wxPAPER_NONE;

 
     wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType);
     if (!paper)
 
     wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType);
     if (!paper)

-      paper = wxThePrintPaperDatabase->FindPaperType(_("A4 210 x 297 mm"));
+        paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4);
+

     if (paper)
     {
     if (paper)
     {

-      previewPrintout->SetPPIScreen(100, 100);
-      previewPrintout->SetPPIPrinter(100, 100);
-
-      // If in landscape mode, we need to swap the width and height.
-      if ( printData.GetOrientation() == wxLANDSCAPE )
-      {
-        pageWidth = paper->heightPixels;
-        pageHeight = paper->widthPixels;
-        previewPrintout->SetPageSizeMM(paper->heightMM, paper->widthMM);
-        previewPrintout->SetPageSizePixels(paper->heightPixels, paper->widthPixels);
-      }
-      else
-      {
-        pageWidth = paper->widthPixels;
-        pageHeight = paper->heightPixels;
-        previewPrintout->SetPageSizeMM(paper->widthMM, paper->heightMM);
-        previewPrintout->SetPageSizePixels(paper->widthPixels, paper->heightPixels);
-      }
-
-      // At 100%, the page should look about page-size on the screen.
-      previewScale = (float)0.8;
-//      previewScale = (float)((float)screenWidth/(float)printerWidth);
-//      previewScale = previewScale * (float)((float)screenXRes/(float)printerYRes);
+        m_previewPrintout->SetPPIScreen(100, 100);
+        //      m_previewPrintout->SetPPIPrinter(100, 100);
+        m_previewPrintout->SetPPIPrinter(72, 72);
+
+        wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
+        wxSize sizeTenthsMM(paper->GetSize());
+        wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
+
+        // If in landscape mode, we need to swap the width and height.
+        if ( m_printDialogData.GetPrintData().GetOrientation() == wxLANDSCAPE )
+        {
+            m_pageWidth = sizeDevUnits.y;
+            m_pageHeight = sizeDevUnits.x;
+            m_previewPrintout->SetPageSizeMM(sizeMM.y, sizeMM.x);
+            m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
+        }
+        else
+        {
+            m_pageWidth = sizeDevUnits.x;
+            m_pageHeight = sizeDevUnits.y;
+            m_previewPrintout->SetPageSizeMM(sizeMM.x, sizeMM.y);
+            m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
+        }
+
+        // At 100%, the page should look about page-size on the screen.
+        m_previewScale = (float)0.8;

     }
 }
 
     }
 }
 

+#endif