allocate HPEN on demand instead of doing every time a pen property is modified; also...

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

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index fd60faf187eeb49fe926e0631d1626003cdab1be..125183e0b0862c8f59be62218b959ebda90ee123 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef _WX_WINPARS_H_
 #define _WX_WINPARS_H_
 
 #ifndef _WX_WINPARS_H_
 #define _WX_WINPARS_H_
 

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

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


@@ -25,10 +20,12 @@
 #include "wx/encconv.h"
 
 class WXDLLIMPEXP_HTML wxHtmlWindow;
 #include "wx/encconv.h"
 
 class WXDLLIMPEXP_HTML wxHtmlWindow;

+class WXDLLIMPEXP_HTML wxHtmlWindowInterface;

 class WXDLLIMPEXP_HTML wxHtmlWinParser;
 class WXDLLIMPEXP_HTML wxHtmlWinTagHandler;
 class WXDLLIMPEXP_HTML wxHtmlTagsModule;
 
 class WXDLLIMPEXP_HTML wxHtmlWinParser;
 class WXDLLIMPEXP_HTML wxHtmlWinTagHandler;
 class WXDLLIMPEXP_HTML wxHtmlTagsModule;
 

+

 //--------------------------------------------------------------------------------
 // wxHtmlWinParser
 //                  This class is derived from wxHtmlParser and its mail goal
 //--------------------------------------------------------------------------------
 // wxHtmlWinParser
 //                  This class is derived from wxHtmlParser and its mail goal


@@ -42,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();


@@ -66,18 +64,22 @@ 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
     void SetStandardFonts(int size = -1,
                           const wxString& normal_face = wxEmptyString,
                           const wxString& fixed_face = wxEmptyString);
 
     // 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);

-    
+

     // Adds tags module. see wxHtmlTagsModule for details.
     static void AddModule(wxHtmlTagsModule *module);
 
     // Adds tags module. see wxHtmlTagsModule for details.
     static void AddModule(wxHtmlTagsModule *module);
 


@@ -117,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; }


@@ -124,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; }


@@ -138,11 +149,13 @@ protected:
     virtual void AddText(const wxChar* txt);
 
 private:
     virtual void AddText(const wxChar* txt);
 
 private:

+    void DoAddText(wxChar *temp, int& templen, wxChar nbsp);
+

     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;


@@ -154,7 +167,7 @@ private:
     wxHtmlContainerCell *m_Container;
             // current container. See Open/CloseContainer for details.
 
     wxHtmlContainerCell *m_Container;
             // current container. See Open/CloseContainer for details.
 

-    int m_FontBold, m_FontItalic, m_FontUnderlined, m_FontFixed; // this is not TRUE,FALSE but 1,0, we need it for indexing
+    int m_FontBold, m_FontItalic, m_FontUnderlined, m_FontFixed; // this is not true,false but 1,0, we need it for indexing

     int m_FontSize; /* -2 to +4,  0 is default */
     wxColour m_LinkColor;
     wxColour m_ActualColor;
     int m_FontSize; /* -2 to +4,  0 is default */
     wxColour m_LinkColor;
     wxColour m_ActualColor;


@@ -162,11 +175,15 @@ private:
     wxHtmlLinkInfo m_Link;
             // actual hypertext link or empty string
     bool m_UseLink;
     wxHtmlLinkInfo m_Link;
             // actual hypertext link or empty string
     bool m_UseLink;

-            // TRUE if m_Link is not empty
+            // true if m_Link is not empty

     long m_CharHeight, m_CharWidth;
             // average height of normal-sized text
     int m_Align;
             // actual alignment
     long m_CharHeight, m_CharWidth;
             // 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];


@@ -190,7 +207,7 @@ private:
 #endif
 
     wxHtmlWordCell *m_lastWordCell;
 #endif
 
     wxHtmlWordCell *m_lastWordCell;

-    
+

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


@@ -211,7 +228,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
     DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)
 
 public:
     DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)
 
 public:

-    wxHtmlWinTagHandler() : wxHtmlTagHandler() {};
+    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;};
 


@@ -239,7 +256,7 @@ class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule
     DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule)
 
 public:

-    wxHtmlTagsModule() : wxModule() {};
+    wxHtmlTagsModule() : wxModule() {}

 
     virtual bool OnInit();
     virtual void OnExit();
 
     virtual bool OnInit();
     virtual void OnExit();