X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..31e57091f20015ec946b8d3f691d3b26748f9783:/include/wx/html/winpars.h

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 4487c87c93..12893b888b 100644
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -4,17 +4,12 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #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
 
@@ -70,7 +65,13 @@ public:
     wxHtmlWindow *GetWindow() {return m_Window;}
 
     // 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);
 
     // Adds tags module. see wxHtmlTagsModule for details.
     static void AddModule(wxHtmlTagsModule *module);
@@ -111,6 +112,12 @@ public:
 
     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; }
@@ -118,6 +125,9 @@ public:
     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; }
@@ -132,6 +142,8 @@ protected:
     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;
@@ -148,7 +160,7 @@ private:
     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;
@@ -156,11 +168,15 @@ private:
     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
+    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];
@@ -184,7 +200,7 @@ private:
 #endif
 
     wxHtmlWordCell *m_lastWordCell;
-    
+
     DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
 };
 
@@ -205,7 +221,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
     DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)
 
 public:
-    wxHtmlWinTagHandler() : wxHtmlTagHandler() {};
+    wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
 
     virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;};
 
@@ -233,7 +249,7 @@ class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule
     DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule)
 
 public:
-    wxHtmlTagsModule() : wxModule() {};
+    wxHtmlTagsModule() : wxModule() {}
 
     virtual bool OnInit();
     virtual void OnExit();