wxMessageBox off the main thread lost result code.

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index b5da2bad870d93a28bca326b204b1c65c000dc3b..3699adae4bd346c4c8c5643d766d11ac67120df9 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        htmprint.h
+// Name:        wx/html/htmprint.h

 // Purpose:     html printing classes
 // Author:      Vaclav Slavik
 // Created:     25/09/99
 // Purpose:     html printing classes
 // Author:      Vaclav Slavik
 // Created:     25/09/99

-// RCS-ID:      $Id$

 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -39,7 +38,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 +175,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 +198,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;