X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..6a5c9b3ff71334ed30bd9ae15425a1ca8ae71174:/include/wx/html/winpars.h diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index d2dd340230..125183e0b0 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,12 @@ #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 wxHtmlWindowInterface; +class WXDLLIMPEXP_HTML wxHtmlWinParser; +class WXDLLIMPEXP_HTML wxHtmlWinTagHandler; +class WXDLLIMPEXP_HTML wxHtmlTagsModule; + //-------------------------------------------------------------------------------- // wxHtmlWinParser @@ -36,13 +33,15 @@ 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: - wxHtmlWinParser(wxHtmlWindow *wnd = NULL); - ~wxHtmlWinParser(); + wxHtmlWinParser(wxHtmlWindowInterface *wndIface = NULL); + + virtual ~wxHtmlWinParser(); virtual void InitParser(const wxString& source); virtual void DoneParser(); @@ -65,11 +64,21 @@ public: // 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). + void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL); - // sets fonts to be used when displaying HTML page. - void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes); + // 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 +119,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,6 +132,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; } @@ -131,11 +149,13 @@ 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; // temporary variables used by AddText - wxHtmlWindow *m_Window; + wxHtmlWindowInterface *m_windowInterface; // window we're parsing for double m_PixelScale; wxDC *m_DC; @@ -145,9 +165,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; @@ -155,11 +175,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]; @@ -176,13 +200,15 @@ private: wxString m_FontFaceFixed, m_FontFaceNormal; // html font sizes and faces of fixed and proportional fonts - DECLARE_NO_COPY_CLASS(wxHtmlWinParser) - #if !wxUSE_UNICODE wxFontEncoding m_InputEnc, m_OutputEnc; // I/O font encodings wxEncodingConverter *m_EncConv; #endif + + wxHtmlWordCell *m_lastWordCell; + + DECLARE_NO_COPY_CLASS(wxHtmlWinParser) }; @@ -190,19 +216,19 @@ 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;}; @@ -217,27 +243,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)) { } }; @@ -245,8 +271,3 @@ public: #endif #endif // _WX_WINPARS_H_ - - - - -