X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/892aeafc2a0212b4c3bebcaddd96a42cdd307afd..0a67a93b17c37c018f60e662645ee2a44ba4e58e:/include/wx/html/htmlwin.h diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index 2c8ebf7763..2bf22cd0cc 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -27,8 +27,7 @@ #include "wx/filesys.h" #include "wx/html/htmlfilt.h" -class WXDLLEXPORT wxHtmlProcessor; - +class wxHtmlProcessor; class wxHtmlWinModule; class wxHtmlHistoryArray; class wxHtmlProcessorList; @@ -52,7 +51,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow public: wxHtmlWindow() : wxScrolledWindow() {}; wxHtmlWindow(wxWindow *parent, wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, + const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "htmlWindow"); @@ -130,11 +129,11 @@ public: // Returns a pointer to the parser. wxHtmlWinParser *GetParser() const { return m_Parser; } - + // Adds HTML processor to this instance of wxHtmlWindow: void AddProcessor(wxHtmlProcessor *processor); // Adds HTML processor to wxHtmlWindow class as whole: - static void AddSharedProcessor(wxHtmlProcessor *processor); + static void AddGlobalProcessor(wxHtmlProcessor *processor); protected: // Scrolls to anchor of this name. (Anchor is #news @@ -143,7 +142,7 @@ protected: // Return value : TRUE if anchor exists, FALSE otherwise bool ScrollToAnchor(const wxString& anchor); - // Prepares layout (= fill m_PosX, m_PosY for fragments) based on + // Prepares layout (= fill m_PosX, m_PosY for fragments) based on // actual size of window. This method also setup scrollbars void CreateLayout(); @@ -210,10 +209,10 @@ private: int m_HistoryPos; // if this FLAG is false, items are not added to history bool m_HistoryOn; - + // html processors array: wxHtmlProcessorList *m_Processors; - static wxHtmlProcessorList *m_SharedProcessors; + static wxHtmlProcessorList *m_GlobalProcessors; DECLARE_EVENT_TABLE() };