don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 393e4da0e3311ef194951f873f2b79a6c73901fe..7c80088e5ecdb47992d77efe6ac226763d474c3f 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Created:     25/09/99
 // RCS-ID:      $Id$
-// Copyright:   (c)
+// Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -30,7 +30,7 @@
 
 //--------------------------------------------------------------------------------
 // wxHtmlDCRenderer
-//                  This class is capable of rendering HTML into specified 
+//                  This class is capable of rendering HTML into specified
 //                  portion of DC
 //--------------------------------------------------------------------------------
 
@@ -52,9 +52,9 @@ public:
     // Sets the text to be displayed.
     // Basepath is base directory (html string would be stored there if it was in
     // file). It is used to determine path for loading images, for example.
-    // isdir is FALSE if basepath is filename, TRUE if it is directory name
+    // isdir is false if basepath is filename, true if it is directory name
     // (see wxFileSystem for detailed explanation)
-    void SetHtmlText(const wxString& html, const wxString& basepath = wxEmptyString, bool isdir = TRUE);
+    void SetHtmlText(const wxString& html, const wxString& basepath = wxEmptyString, bool isdir = true);
 
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL);
@@ -81,7 +81,8 @@ public:
     // set the same pagebreak twice.
     //
     // CAUTION! Render() changes DC's user scale and does NOT restore it!
-    int Render(int x, int y, int from = 0, int dont_render = FALSE, int to = INT_MAX,
+    int Render(int x, int y, int from = 0, int dont_render = FALSE,
+               int maxHeight = INT_MAX,
                int *known_pagebreaks = NULL, int number_of_pages = 0);
 
     // returns total height of the html document
@@ -123,13 +124,13 @@ public:
     wxHtmlPrintout(const wxString& title = wxT("Printout"));
     ~wxHtmlPrintout();
 
-    void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = TRUE); 
+    void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = true);
             // prepares the class for printing this html document.
             // Must be called before using the class, in fact just after constructor
             //
             // basepath is base directory (html string would be stored there if it was in
             // file). It is used to determine path for loading images, for example.
-            // isdir is FALSE if basepath is filename, TRUE if it is directory name
+            // isdir is false if basepath is filename, true if it is directory name
             // (see wxFileSystem for detailed explanation)
 
     void SetHtmlFile(const wxString &htmlfile);
@@ -154,12 +155,12 @@ public:
                           const wxString& normal_face = wxEmptyString,
                           const wxString& fixed_face = wxEmptyString);
 
-    void SetMargins(float top = 25.2, float bottom = 25.2, float left = 25.2, float right = 25.2, 
+    void SetMargins(float top = 25.2, float bottom = 25.2, float left = 25.2, float right = 25.2,
                     float spaces = 5);
             // sets margins in milimeters. Defaults to 1 inch for margins and 0.5cm for space
             // between text and header and/or footer
 
-    // wxPrintout stuff:        
+    // wxPrintout stuff:
     bool OnPrintPage(int page);
     bool HasPage(int page);
     void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
@@ -206,12 +207,12 @@ private:
 
 //--------------------------------------------------------------------------------
 // wxHtmlEasyPrinting
-//                  This class provides very simple interface to printing 
+//                  This class provides very simple interface to printing
 //                  architecture. It allows you to print HTML documents only
-//                  with very few commands. 
+//                  with very few commands.
 //
 //                  Note : do not create this class on stack only.
-//                         You should create an instance on app startup and 
+//                         You should create an instance on app startup and
 //                         use this instance for all printing. Why? The class
 //                         stores page&printer settings in it.
 //--------------------------------------------------------------------------------
@@ -232,7 +233,6 @@ public:
     bool PrintText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
             // Print file / html-text w/o preview
 
-    void PrinterSetup();
     void PageSetup();
             // pop up printer or page setup dialog
 
@@ -254,10 +254,10 @@ public:
     void SetStandardFonts(int size = -1,
                           const wxString& normal_face = wxEmptyString,
                           const wxString& fixed_face = wxEmptyString);
-    
+
     wxPrintData *GetPrintData();
     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
-            // return page setting data objects. 
+            // return page setting data objects.
             // (You can set their parameters.)
 
 protected:
@@ -279,7 +279,7 @@ private:
         FontMode_Standard
     };
     FontMode m_fontMode;
-    
+
     wxString m_Headers[2], m_Footers[2];
     wxWindow *m_ParentWindow;