don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 1598718cc414771fbecc40b0eabf6e6796e6e721..cf0a18fb122ad929585ee8d0e935ca3dd1945bf3 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -80,9 +80,12 @@ public:
     int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
                int dont_render = false, int to = INT_MAX);
 
     int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
                int dont_render = false, int to = INT_MAX);
 

+    // returns total width of the html document
+    int GetTotalWidth() const;
+

     // returns total height of the html document
     // (compare Render's return value with this)
     // returns total height of the html document
     // (compare Render's return value with this)

-    int GetTotalHeight();
+    int GetTotalHeight() const;

 
 private:
     wxDC *m_DC;
 
 private:
     wxDC *m_DC;


@@ -91,7 +94,7 @@ private:
     wxHtmlContainerCell *m_Cells;
     int m_MaxWidth, m_Width, m_Height;
 
     wxHtmlContainerCell *m_Cells;
     int m_MaxWidth, m_Width, m_Height;
 

-    DECLARE_NO_COPY_CLASS(wxHtmlDCRenderer)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlDCRenderer);

 };
 
 
 };
 
 


@@ -169,6 +172,18 @@ public:
     static void CleanUpStatics();
 
 private:
     static void CleanUpStatics();
 
 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
+    //
+    // 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
+    virtual bool CheckFit(const wxSize& pageArea, const wxSize& docArea) const;

 
     void RenderPage(wxDC *dc, int page);
             // renders one page into dc
 
     void RenderPage(wxDC *dc, int page);
             // renders one page into dc


@@ -194,7 +209,7 @@ private:
     // list of HTML filters
     static wxList m_Filters;
 
     // list of HTML filters
     static wxList m_Filters;
 

-    DECLARE_NO_COPY_CLASS(wxHtmlPrintout)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlPrintout);

 };
 
 
 };
 
 


@@ -284,7 +299,7 @@ private:
     wxString m_Headers[2], m_Footers[2];
     wxWindow *m_ParentWindow;
 
     wxString m_Headers[2], m_Footers[2];
     wxWindow *m_ParentWindow;
 

-    DECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting);

 };
 
 
 };