Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index e2a27bc59b8d0e5d57af47f648805266dd2977ea..df90a47dce40aa01c73d90063606620028f62979 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -30,7 +30,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
 //--------------------------------------------------------------------------------
 


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

-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
+    // Sets font sizes to be relative to the given size or the system
+    // default size; use either specified or default font
+    void SetStandardFonts(int size = -1,
+                          const wxString& normal_face = wxEmptyString,
+                          const wxString& fixed_face = wxEmptyString);

 
     // [x,y] is position of upper-left corner of printing rectangle (see SetSize)
     // from is y-coordinate of the very first visible cell
 
     // [x,y] is position of upper-left corner of printing rectangle (see SetSize)
     // from is y-coordinate of the very first visible cell


@@ -78,7 +81,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 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
                int *known_pagebreaks = NULL, int number_of_pages = 0);
 
     // returns total height of the html document


@@ -120,13 +124,13 @@ public:
     wxHtmlPrintout(const wxString& title = wxT("Printout"));
     ~wxHtmlPrintout();
 
     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.
             // 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);


@@ -145,15 +149,18 @@ public:
     // 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);
 
     // 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);
 

-    // Sets font sizes to be relative to the given size or the system default size
-    void NormalizeFontSizes(int size=-1);
+    // Sets font sizes to be relative to the given size or the system
+    // default size; use either specified or default font
+    void SetStandardFonts(int size = -1,
+                          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);


@@ -200,12 +207,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.
 //--------------------------------------------------------------------------------


@@ -226,7 +233,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
 


@@ -243,12 +249,15 @@ public:
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0);
     // 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 = 0);
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
 

-    void NormalizeFontSizes(int size=-1);
-    // Sets font sizes to be relative to the given size or the system default size
-    
+    // Sets font sizes to be relative to the given size or the system
+    // default size; use either specified or default font
+    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:


@@ -263,6 +272,14 @@ private:
     int m_FontsSizesArr[7];
     int *m_FontsSizes;
     wxString m_FontFaceFixed, m_FontFaceNormal;
     int m_FontsSizesArr[7];
     int *m_FontsSizes;
     wxString m_FontFaceFixed, m_FontFaceNormal;

+
+    enum FontMode
+    {
+        FontMode_Explicit,
+        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;