support wxFD_MULTIPLE

[wxWidgets.git] / include / wx / html / htmprint.h

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index cf0a18fb122ad929585ee8d0e935ca3dd1945bf3..74024d433baedc9a5de59dc9fbdfb22740016775 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -39,7 +39,9 @@ public:
     // Following 3 methods *must* be called before any call to Render:
 
     // Assign DC to this render
     // Following 3 methods *must* be called before any call to Render:
 
     // Assign DC to this render

-    void SetDC(wxDC *dc, double pixel_scale = 1.0);
+    void SetDC(wxDC *dc, double pixel_scale = 1.0)
+        { SetDC(dc, pixel_scale, pixel_scale); }
+    void SetDC(wxDC *dc, double pixel_scale, double font_scale);

 
     // Sets size of output rectangle, in pixels. Note that you *can't* change
     // width of the rectangle between calls to Render! (You can freely change height.)
 
     // Sets size of output rectangle, in pixels. Note that you *can't* change
     // width of the rectangle between calls to Render! (You can freely change height.)


@@ -174,15 +176,17 @@ public:
 private:
     // this function is called by the base class OnPreparePrinting()
     // implementation and by default checks whether the document fits into
 private:
     // this function is called by the base class OnPreparePrinting()
     // implementation and by default checks whether the document fits into

-    // pageArea horizontally and warns the user if it does not, giving him
-    // the possibility to cancel printing in this case
+    // pageArea horizontally and warns the user if it does not and, if we're
+    // going to print and not just to preview the document, giving him the
+    // possibility to cancel printing

     //
     // you may override it to either suppress this check if truncation of the
     // HTML being printed is acceptable or, on the contrary, add more checks to
     // it, e.g. for the fit in the vertical direction if the document should
     // always appear on a single page
     //
     //
     // you may override it to either suppress this check if truncation of the
     // HTML being printed is acceptable or, on the contrary, add more checks to
     // it, e.g. for the fit in the vertical direction if the document should
     // always appear on a single page
     //

-    // return true if printing should go ahead or false to cancel it
+    // return true if printing should go ahead or false to cancel it (the
+    // return value is ignored when previewing)

     virtual bool CheckFit(const wxSize& pageArea, const wxSize& docArea) const;
 
     void RenderPage(wxDC *dc, int page);
     virtual bool CheckFit(const wxSize& pageArea, const wxSize& docArea) const;
 
     void RenderPage(wxDC *dc, int page);


@@ -195,7 +199,6 @@ private:
 
 private:
     int m_NumPages;
 
 private:
     int m_NumPages;

-    //int m_PageBreaks[wxHTML_PRINT_MAX_PAGES];

     wxArrayInt m_PageBreaks;
 
     wxString m_Document, m_BasePath;
     wxArrayInt m_PageBreaks;
 
     wxString m_Document, m_BasePath;


@@ -276,6 +279,11 @@ public:
     void SetParentWindow(wxWindow* window) { m_ParentWindow = window; }
             // set the parent window
 
     void SetParentWindow(wxWindow* window) { m_ParentWindow = window; }
             // set the parent window
 

+    const wxString& GetName() const { return m_Name; }
+            // get the printout name
+    void SetName(const wxString& name) { m_Name = name; }
+            // set the printout name
+

 protected:
     virtual wxHtmlPrintout *CreatePrintout();
     virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);
 protected:
     virtual wxHtmlPrintout *CreatePrintout();
     virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);