X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..467e04791c0d5914dc8ed8e535af607f7fc1dfe1:/include/wx/html/winpars.h diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 5e6866d069..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: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef _WX_WINPARS_H_ #define _WX_WINPARS_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "winpars.h" -#endif - #include "wx/defs.h" #if wxUSE_HTML @@ -24,10 +19,10 @@ #include "wx/html/htmlcell.h" #include "wx/encconv.h" -class WXDLLEXPORT wxHtmlWindow; -class WXDLLEXPORT wxHtmlWinParser; -class WXDLLEXPORT wxHtmlWinTagHandler; -class WXDLLEXPORT wxHtmlTagsModule; +class WXDLLIMPEXP_HTML wxHtmlWindow; +class WXDLLIMPEXP_HTML wxHtmlWinParser; +class WXDLLIMPEXP_HTML wxHtmlWinTagHandler; +class WXDLLIMPEXP_HTML wxHtmlTagsModule; //-------------------------------------------------------------------------------- // wxHtmlWinParser @@ -36,8 +31,9 @@ class WXDLLEXPORT wxHtmlTagsModule; // wxHtmlWindow. It uses special wxHtmlWinTagHandler. //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWinParser : public wxHtmlParser +class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser { + DECLARE_ABSTRACT_CLASS(wxHtmlWinParser) friend class wxHtmlWindow; public: @@ -68,8 +64,14 @@ public: // returns associated wxWindow wxHtmlWindow *GetWindow() {return m_Window;} - // sets fonts to be used when displaying HTML page. - void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes); + // Sets fonts to be used when displaying HTML page. (if size null then default sizes used). + 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); @@ -110,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; } @@ -117,10 +125,15 @@ 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; } wxFontEncoding GetOutputEncoding() const { return m_OutputEnc; } wxEncodingConverter *GetEncodingConverter() const { return m_EncConv; } +#endif // creates font depending on m_Font* members. virtual wxFont* CreateCurrentFont(); @@ -129,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; @@ -143,9 +158,9 @@ private: // This list is used to initialize m_Handlers member. wxHtmlContainerCell *m_Container; - // actual container. See Open/CloseContainer for details. + // 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; @@ -153,15 +168,21 @@ 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]; +#if !wxUSE_UNICODE wxFontEncoding m_FontsEncTable[2][2][2][2][7]; +#endif // table of loaded fonts. 1st four indexes are 0 or 1, depending on on/off // state of these flags (from left to right): // [bold][italic][underlined][fixed_size] @@ -172,9 +193,15 @@ private: wxString m_FontFaceFixed, m_FontFaceNormal; // html font sizes and faces of fixed and proportional fonts +#if !wxUSE_UNICODE wxFontEncoding m_InputEnc, m_OutputEnc; // I/O font encodings wxEncodingConverter *m_EncConv; +#endif + + wxHtmlWordCell *m_lastWordCell; + + DECLARE_NO_COPY_CLASS(wxHtmlWinParser) }; @@ -182,24 +209,26 @@ private: -//-------------------------------------------------------------------------------- +//----------------------------------------------------------------------------- // wxHtmlWinTagHandler // This is basicly wxHtmlTagHandler except // it is extended with protected member m_Parser pointing to // the wxHtmlWinParser object -//-------------------------------------------------------------------------------- +//----------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWinTagHandler : public wxHtmlTagHandler +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;}; protected: wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted + + DECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler) }; @@ -207,27 +236,27 @@ protected: -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxHtmlTagsModule // This is basic of dynamic tag handlers binding. // The class provides methods for filling parser's handlers // hash table. // (See documentation for details) -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlTagsModule : public wxModule +class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule { DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule) public: - wxHtmlTagsModule() : wxModule() {}; + wxHtmlTagsModule() : wxModule() {} virtual bool OnInit(); virtual void OnExit(); // This is called by wxHtmlWinParser. - // The method must simply call parser->AddTagHandler(new ); - // for each handler + // The method must simply call parser->AddTagHandler(new + // ); for each handler virtual void FillHandlersTable(wxHtmlWinParser * WXUNUSED(parser)) { } }; @@ -235,8 +264,3 @@ public: #endif #endif // _WX_WINPARS_H_ - - - - -