for built-in dialogs, there is no m_peer instance, and still we might have a Refresh...

[wxWidgets.git] / src / html / htmprint.cpp

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 099cf3bbd546057ffe23c39fd55b750cae74f199..720bde4849a338cdbfaa1837e0741d7996e52110 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -9,7 +9,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

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

 #pragma implementation "htmprint.h"
 #endif
 
 #pragma implementation "htmprint.h"
 #endif
 


@@ -36,6 +36,7 @@
 #include "wx/html/htmprint.h"
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"
 #include "wx/html/htmprint.h"
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"

+#include "wx/module.h"

 
 
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------


@@ -114,12 +115,15 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, in
 
     if (!dont_render)
     {
 
     if (!dont_render)
     {

+        wxHtmlRenderingInfo rinfo;
+        wxDefaultHtmlRenderingStyle rstyle;
+        rinfo.SetStyle(&rstyle);

         m_DC->SetBrush(*wxWHITE_BRUSH);
         m_DC->SetBrush(*wxWHITE_BRUSH);

-

         m_DC->SetClippingRegion(x, y, m_Width, hght);
         m_Cells->Draw(*m_DC,
         m_DC->SetClippingRegion(x, y, m_Width, hght);
         m_Cells->Draw(*m_DC,

-                        x, (y - from),
-                        y, pbreak + (y /*- from*/));
+                      x, (y - from),
+                      y, pbreak + (y /*- from*/),
+                      rinfo);

         m_DC->DestroyClippingRegion();
     }
 
         m_DC->DestroyClippingRegion();
     }
 


@@ -136,25 +140,12 @@ int wxHtmlDCRenderer::GetTotalHeight()
 }
 
 
 }
 
 

-
-
-
-
-
-
-
-
-
-
-
-
-
-

 //--------------------------------------------------------------------------------
 // wxHtmlPrintout
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 // wxHtmlPrintout
 //--------------------------------------------------------------------------------
 
 

+wxList wxHtmlPrintout::m_Filters;

 
 wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {
 
 wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {


@@ -176,15 +167,22 @@ wxHtmlPrintout::~wxHtmlPrintout()
     delete m_RendererHdr;
 }
 
     delete m_RendererHdr;
 }
 

+void wxHtmlPrintout::CleanUpStatics()
+{
+    WX_CLEAR_LIST(wxList, m_Filters);
+}

 
 

+// Adds input filter
+void wxHtmlPrintout::AddFilter(wxHtmlFilter *filter)
+{
+    m_Filters.Append(filter);
+}

 
 

-bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
+void wxHtmlPrintout::OnPreparePrinting()

 {
     int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
     float ppmm_h, ppmm_v;
 
 {
     int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
     float ppmm_h, ppmm_v;
 

-    if (!wxPrintout::OnBeginDocument(startPage, endPage)) return FALSE;
-

     GetPageSizePixels(&pageWidth, &pageHeight);
     GetPageSizeMM(&mm_w, &mm_h);
     ppmm_h = (float)pageWidth / mm_w;
     GetPageSizePixels(&pageWidth, &pageHeight);
     GetPageSizeMM(&mm_w, &mm_h);
     ppmm_h = (float)pageWidth / mm_w;


@@ -236,6 +234,12 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
                           ));
     m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);
     CountPages();
                           ));
     m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);
     CountPages();

+}
+
+bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
+{
+    if (!wxPrintout::OnBeginDocument(startPage, endPage)) return FALSE;
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -256,9 +260,9 @@ bool wxHtmlPrintout::OnPrintPage(int page)
 void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
 {
     *minPage = 1;
 void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
 {
     *minPage = 1;

-    *maxPage = wxHTML_PRINT_MAX_PAGES;
+    *maxPage = m_NumPages;

     *selPageFrom = 1;
     *selPageFrom = 1;

-    *selPageTo = wxHTML_PRINT_MAX_PAGES;
+    *selPageTo = m_NumPages;

 }
 
 
 }
 
 


@@ -288,9 +292,26 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
         return;
     }
 
         return;
     }
 

-    wxHtmlFilterHTML filter;
-    wxString doc = filter.ReadFile(*ff);
-    
+    bool done = FALSE;
+    wxHtmlFilterHTML defaultFilter;
+    wxString doc;
+
+    wxList::compatibility_iterator node = m_Filters.GetFirst();
+    while (node)
+    {
+        wxHtmlFilter *h = (wxHtmlFilter*) node->GetData();
+        if (h->CanRead(*ff))
+        {
+            doc = h->ReadFile(*ff);
+            done = TRUE;
+            break;
+        }
+        node = node->GetNext();
+    }
+
+    if (!done)
+        doc = defaultFilter.ReadFile(*ff);
+        

     SetHtmlText(doc, htmlfile, FALSE);
     delete ff;
 }
     SetHtmlText(doc, htmlfile, FALSE);
     delete ff;
 }


@@ -360,8 +381,10 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
 
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
 
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);

+    wxUnusedVar(ppiPrinterX);

     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);

+    wxUnusedVar(ppiScreenX);

 
     dc->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth);
 
 
     dc->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth);
 


@@ -434,7 +457,7 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWin
 {
     m_ParentWindow = parentWindow;
     m_Name = name;
 {
     m_ParentWindow = parentWindow;
     m_Name = name;

-    m_PrintData = new wxPrintData;
+    m_PrintData = NULL;

     m_PageSetupData = new wxPageSetupDialogData;
     m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString;
 
     m_PageSetupData = new wxPageSetupDialogData;
     m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString;
 


@@ -454,6 +477,13 @@ wxHtmlEasyPrinting::~wxHtmlEasyPrinting()
 }
 
 
 }
 
 

+wxPrintData *wxHtmlEasyPrinting::GetPrintData()
+{
+    if (m_PrintData == NULL)
+        m_PrintData = new wxPrintData();
+    return m_PrintData;
+}
+

 
 bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
 {
 
 bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
 {


@@ -502,7 +532,7 @@ bool wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &bas
 bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2)
 {
     // Pass two printout objects: for preview, and possible printing.
 bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2)
 {
     // Pass two printout objects: for preview, and possible printing.

-    wxPrintDialogData printDialogData(*m_PrintData);
+    wxPrintDialogData printDialogData(*GetPrintData());

     wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData);
     if (!preview->Ok())
     {
     wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData);
     if (!preview->Ok())
     {


@@ -523,7 +553,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
 
 bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
 {
 
 bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
 {

-    wxPrintDialogData printDialogData(*m_PrintData);
+    wxPrintDialogData printDialogData(*GetPrintData());

     wxPrinter printer(&printDialogData);
 
     if (!printer.Print(m_ParentWindow, printout, TRUE))
     wxPrinter printer(&printDialogData);
 
     if (!printer.Print(m_ParentWindow, printout, TRUE))


@@ -531,7 +561,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    (*m_PrintData) = printer.GetPrintDialogData().GetPrintData();
+    (*GetPrintData()) = printer.GetPrintDialogData().GetPrintData();

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -539,31 +569,31 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
 
 void wxHtmlEasyPrinting::PrinterSetup()
 {
 
 void wxHtmlEasyPrinting::PrinterSetup()
 {

-    wxPrintDialogData printDialogData(*m_PrintData);
+    wxPrintDialogData printDialogData(*GetPrintData());

     wxPrintDialog printerDialog(m_ParentWindow, &printDialogData);
 
     printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
 
     if (printerDialog.ShowModal() == wxID_OK)
     wxPrintDialog printerDialog(m_ParentWindow, &printDialogData);
 
     printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
 
     if (printerDialog.ShowModal() == wxID_OK)

-        (*m_PrintData) = printerDialog.GetPrintDialogData().GetPrintData();
+        (*GetPrintData()) = printerDialog.GetPrintDialogData().GetPrintData();

 }
 
 
 
 void wxHtmlEasyPrinting::PageSetup()
 {
 }
 
 
 
 void wxHtmlEasyPrinting::PageSetup()
 {

-    if (!m_PrintData->Ok())
+    if (!GetPrintData()->Ok())

     {
         wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
         return;
     }
 
     {
         wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
         return;
     }
 

-    m_PageSetupData->SetPrintData(*m_PrintData);
+    m_PageSetupData->SetPrintData(*GetPrintData());

     wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData);
 
     if (pageSetupDialog.ShowModal() == wxID_OK)
     {
     wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData);
 
     if (pageSetupDialog.ShowModal() == wxID_OK)
     {

-        (*m_PrintData) = pageSetupDialog.GetPageSetupData().GetPrintData();
+        (*GetPrintData()) = pageSetupDialog.GetPageSetupData().GetPrintData();

         (*m_PageSetupData) = pageSetupDialog.GetPageSetupData();
     }
 }
         (*m_PageSetupData) = pageSetupDialog.GetPageSetupData();
     }
 }


@@ -624,6 +654,21 @@ wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout()
     return p;
 }
 
     return p;
 }
 

+// A module to allow initialization/cleanup
+// without calling these functions from app.cpp or from
+// the user's application.
+
+class wxHtmlPrintingModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule)
+public:
+    wxHtmlPrintingModule() : wxModule() {}
+    bool OnInit() { return TRUE; }
+    void OnExit() { wxHtmlPrintout::CleanUpStatics(); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlPrintingModule, wxModule)
+

 
 // This hack forces the linker to always link in m_* files
 // (wxHTML doesn't work without handlers from these files)
 
 // This hack forces the linker to always link in m_* files
 // (wxHTML doesn't work without handlers from these files)