Minor corrections to make dist after reports

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

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 783b172052549647746e4ebbf3c192a587da426e..5835338889ef28f8d0cf8e20bb3f0f23c087752c 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -19,10 +19,12 @@
 #include "wx/html/htmlcell.h"
 #include "wx/encconv.h"
 
 #include "wx/html/htmlcell.h"
 #include "wx/encconv.h"
 

-class WXDLLIMPEXP_HTML wxHtmlWindow;
-class WXDLLIMPEXP_HTML wxHtmlWinParser;
-class WXDLLIMPEXP_HTML wxHtmlWinTagHandler;
-class WXDLLIMPEXP_HTML wxHtmlTagsModule;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWindow;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWinTagHandler;
+class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule;
+

 
 //--------------------------------------------------------------------------------
 // wxHtmlWinParser
 
 //--------------------------------------------------------------------------------
 // wxHtmlWinParser


@@ -37,8 +39,9 @@ class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser
     friend class wxHtmlWindow;
 
 public:
     friend class wxHtmlWindow;
 
 public:

-    wxHtmlWinParser(wxHtmlWindow *wnd = NULL);
-    ~wxHtmlWinParser();
+    wxHtmlWinParser(wxHtmlWindowInterface *wndIface = NULL);
+
+    virtual ~wxHtmlWinParser();

 
     virtual void InitParser(const wxString& source);
     virtual void DoneParser();
 
     virtual void InitParser(const wxString& source);
     virtual void DoneParser();


@@ -61,11 +64,15 @@ public:
     // for this DC. If you want actual values, call
     // GetDC()->GetChar...()
 
     // for this DC. If you want actual values, call
     // GetDC()->GetChar...()
 

-    // returns associated wxWindow
-    wxHtmlWindow *GetWindow() {return m_Window;}
+    // returns interface to the rendering window
+    wxHtmlWindowInterface *GetWindowInterface() {return m_windowInterface;}
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated, use GetWindowInterface()->GetHTMLWindow() instead
+    wxDEPRECATED( wxHtmlWindow *GetWindow() );
+#endif

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


@@ -112,6 +119,12 @@ public:
 
     int GetAlign() const {return m_Align;}
     void SetAlign(int a) {m_Align = a;}
 
     int GetAlign() const {return m_Align;}
     void SetAlign(int a) {m_Align = a;}

+
+    wxHtmlScriptMode GetScriptMode() const { return m_ScriptMode; }
+    void SetScriptMode(wxHtmlScriptMode mode) { m_ScriptMode = mode; }
+    long GetScriptBaseline() const { return m_ScriptBaseline; }
+    void SetScriptBaseline(long base) { m_ScriptBaseline = base; }
+

     const wxColour& GetLinkColor() const { return m_LinkColor; }
     void SetLinkColor(const wxColour& clr) { m_LinkColor = clr; }
     const wxColour& GetActualColor() const { return m_ActualColor; }
     const wxColour& GetLinkColor() const { return m_LinkColor; }
     void SetLinkColor(const wxColour& clr) { m_LinkColor = clr; }
     const wxColour& GetActualColor() const { return m_ActualColor; }


@@ -119,6 +132,9 @@ public:
     const wxHtmlLinkInfo& GetLink() const { return m_Link; }
     void SetLink(const wxHtmlLinkInfo& link);
 
     const wxHtmlLinkInfo& GetLink() const { return m_Link; }
     void SetLink(const wxHtmlLinkInfo& link);
 

+    // applies current parser state (link, sub/supscript, ...) to given cell
+    void ApplyStateToCell(wxHtmlCell *cell);
+

 #if !wxUSE_UNICODE
     void SetInputEncoding(wxFontEncoding enc);
     wxFontEncoding GetInputEncoding() const { return m_InputEnc; }
 #if !wxUSE_UNICODE
     void SetInputEncoding(wxFontEncoding enc);
     wxFontEncoding GetInputEncoding() const { return m_InputEnc; }


@@ -129,15 +145,31 @@ public:
     // creates font depending on m_Font* members.
     virtual wxFont* CreateCurrentFont();
 
     // creates font depending on m_Font* members.
     virtual wxFont* CreateCurrentFont();
 

+    enum WhitespaceMode
+    {
+        Whitespace_Normal,  // normal mode, collapse whitespace
+        Whitespace_Pre      // inside <pre>, keep whitespace as-is
+    };
+
+    // change the current whitespace handling mode
+    void SetWhitespaceMode(WhitespaceMode mode) { m_whitespaceMode = mode; }
+    WhitespaceMode GetWhitespaceMode() const { return m_whitespaceMode; }
+

 protected:
 protected:

-    virtual void AddText(const wxChar* txt);
+    virtual void AddText(const wxString& txt);

 
 private:
 
 private:

+    void FlushWordBuf(wxChar *temp, int& len);
+    void AddWord(wxHtmlWordCell *word);
+    void AddWord(const wxString& word)
+        { AddWord(new wxHtmlWordCell(word, *(GetDC()))); }
+    void AddPreBlock(const wxString& text);
+

     bool m_tmpLastWasSpace;
     wxChar *m_tmpStrBuf;
     size_t  m_tmpStrBufSize;
         // temporary variables used by AddText
     bool m_tmpLastWasSpace;
     wxChar *m_tmpStrBuf;
     size_t  m_tmpStrBufSize;
         // temporary variables used by AddText

-    wxHtmlWindow *m_Window;
+    wxHtmlWindowInterface *m_windowInterface;

             // window we're parsing for
     double m_PixelScale;
     wxDC *m_DC;
             // window we're parsing for
     double m_PixelScale;
     wxDC *m_DC;


@@ -162,6 +194,10 @@ private:
             // average height of normal-sized text
     int m_Align;
             // actual alignment
             // average height of normal-sized text
     int m_Align;
             // actual alignment

+    wxHtmlScriptMode m_ScriptMode;
+            // current script mode (sub/sup/normal)
+    long m_ScriptBaseline;
+            // current sub/supscript base

 
     wxFont* m_FontsTable[2][2][2][2][7];
     wxString m_FontsFacesTable[2][2][2][2][7];
 
     wxFont* m_FontsTable[2][2][2][2][7];
     wxString m_FontsFacesTable[2][2][2][2][7];


@@ -179,13 +215,21 @@ private:
             // html font sizes and faces of fixed and proportional fonts
 
 #if !wxUSE_UNICODE
             // html font sizes and faces of fixed and proportional fonts
 
 #if !wxUSE_UNICODE

+    wxChar m_nbsp;

     wxFontEncoding m_InputEnc, m_OutputEnc;
             // I/O font encodings
     wxEncodingConverter *m_EncConv;
 #endif
 
     wxFontEncoding m_InputEnc, m_OutputEnc;
             // I/O font encodings
     wxEncodingConverter *m_EncConv;
 #endif
 

+    // current whitespace handling mode
+    WhitespaceMode m_whitespaceMode;
+

     wxHtmlWordCell *m_lastWordCell;
 
     wxHtmlWordCell *m_lastWordCell;
 

+    // current position on line, in num. of characters; used to properly
+    // expand TABs; only updated while inside <pre>
+    int m_posColumn;
+

     DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
 };
 
     DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
 };
 


@@ -208,7 +252,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
 public:
     wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
 
 public:
     wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
 

-    virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;};
+    virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}

 
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
 
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted