Fixed ReadLine missing last character from text files with no final newline.

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 393e4da0e3311ef194951f873f2b79a6c73901fe..da25bc28130fcf7c0f09c5df654c5b0c1916d7a3 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -4,17 +4,13 @@
 // Author:      Vaclav Slavik
 // Created:     25/09/99
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     25/09/99
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Vaclav Slavik

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "htmprint.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE
 #include "wx/defs.h"
 
 #if wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE


@@ -30,7 +26,7 @@
 
 //--------------------------------------------------------------------------------
 // wxHtmlDCRenderer
 
 //--------------------------------------------------------------------------------
 // wxHtmlDCRenderer

-//                  This class is capable of rendering HTML into specified 
+//                  This class is capable of rendering HTML into specified

 //                  portion of DC
 //--------------------------------------------------------------------------------
 
 //                  portion of DC
 //--------------------------------------------------------------------------------
 


@@ -38,7 +34,7 @@ class WXDLLIMPEXP_HTML wxHtmlDCRenderer : public wxObject
 {
 public:
     wxHtmlDCRenderer();
 {
 public:
     wxHtmlDCRenderer();

-    ~wxHtmlDCRenderer();
+    virtual ~wxHtmlDCRenderer();

 
     // Following 3 methods *must* be called before any call to Render:
 
 
     // Following 3 methods *must* be called before any call to Render:
 


@@ -52,12 +48,12 @@ 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.
     // 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)
     // (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).
 
     // 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);
+    void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL);

 
     // Sets font sizes to be relative to the given size or the system
     // default size; use either specified or default font
 
     // Sets font sizes to be relative to the given size or the system
     // default size; use either specified or default font


@@ -81,8 +77,8 @@ public:
     // set the same pagebreak twice.
     //
     // CAUTION! Render() changes DC's user scale and does NOT restore it!
     // 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 *known_pagebreaks = NULL, int number_of_pages = 0);
+    int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
+               int dont_render = FALSE, int to = INT_MAX);

 
     // 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)


@@ -121,15 +117,15 @@ class WXDLLIMPEXP_HTML wxHtmlPrintout : public wxPrintout
 {
 public:
     wxHtmlPrintout(const wxString& title = wxT("Printout"));
 {
 public:
     wxHtmlPrintout(const wxString& title = wxT("Printout"));

-    ~wxHtmlPrintout();
+    virtual ~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.
             // 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);
             // (see wxFileSystem for detailed explanation)
 
     void SetHtmlFile(const wxString &htmlfile);


@@ -146,7 +142,7 @@ public:
             // You can set different header/footer for odd and even pages
 
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
             // You can set different header/footer for odd and even pages
 
     // 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);
+    void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL);

 
     // Sets font sizes to be relative to the given size or the system
     // default size; use either specified or default font
 
     // Sets font sizes to be relative to the given size or the system
     // default size; use either specified or default font


@@ -154,12 +150,12 @@ public:
                           const wxString& normal_face = wxEmptyString,
                           const wxString& fixed_face = wxEmptyString);
 
                           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
 
                     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);
     bool OnPrintPage(int page);
     bool HasPage(int page);
     void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);


@@ -184,7 +180,8 @@ private:
 
 private:
     int m_NumPages;
 
 private:
     int m_NumPages;

-    int m_PageBreaks[wxHTML_PRINT_MAX_PAGES];
+    //int m_PageBreaks[wxHTML_PRINT_MAX_PAGES];
+    wxArrayInt m_PageBreaks;

 
     wxString m_Document, m_BasePath;
     bool m_BasePathIsDir;
 
     wxString m_Document, m_BasePath;
     bool m_BasePathIsDir;


@@ -206,12 +203,12 @@ private:
 
 //--------------------------------------------------------------------------------
 // wxHtmlEasyPrinting
 
 //--------------------------------------------------------------------------------
 // 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
 //                  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.
 //
 //                  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.
 //--------------------------------------------------------------------------------
 //                         use this instance for all printing. Why? The class
 //                         stores page&printer settings in it.
 //--------------------------------------------------------------------------------


@@ -220,7 +217,7 @@ class WXDLLIMPEXP_HTML wxHtmlEasyPrinting : public wxObject
 {
 public:
     wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL);
 {
 public:
     wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL);

-    ~wxHtmlEasyPrinting();
+    virtual ~wxHtmlEasyPrinting();

 
     bool PreviewFile(const wxString &htmlfile);
     bool PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
 
     bool PreviewFile(const wxString &htmlfile);
     bool PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString);


@@ -232,7 +229,6 @@ public:
     bool PrintText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
             // Print file / html-text w/o preview
 
     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
 
     void PageSetup();
             // pop up printer or page setup dialog
 


@@ -246,7 +242,7 @@ public:
             // pg is one of wxPAGE_ODD, wxPAGE_EVEN and wx_PAGE_ALL constants.
             // You can set different header/footer for odd and even pages
 
             // pg is one of wxPAGE_ODD, wxPAGE_EVEN and wx_PAGE_ALL constants.
             // You can set different header/footer for odd and even pages
 

-    void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0);
+    void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = 0);

     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
 
     // Sets font sizes to be relative to the given size or the system
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
 
     // Sets font sizes to be relative to the given size or the system


@@ -254,10 +250,10 @@ public:
     void SetStandardFonts(int size = -1,
                           const wxString& normal_face = wxEmptyString,
                           const wxString& fixed_face = wxEmptyString);
     void SetStandardFonts(int size = -1,
                           const wxString& normal_face = wxEmptyString,
                           const wxString& fixed_face = wxEmptyString);

-    
+

     wxPrintData *GetPrintData();
     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
     wxPrintData *GetPrintData();
     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}

-            // return page setting data objects. 
+            // return page setting data objects.

             // (You can set their parameters.)
 
 protected:
             // (You can set their parameters.)
 
 protected:


@@ -279,7 +275,7 @@ private:
         FontMode_Standard
     };
     FontMode m_fontMode;
         FontMode_Standard
     };
     FontMode m_fontMode;

-    
+

     wxString m_Headers[2], m_Footers[2];
     wxWindow *m_ParentWindow;
 
     wxString m_Headers[2], m_Footers[2];
     wxWindow *m_ParentWindow;