X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/html/helpdata.h diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index a330095139..09b1a46bce 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpdata.h +// Name: wx/html/helpdata.h // Purpose: wxHtmlHelpData // Notes: Based on htmlhelp.cpp, implementing a monolithic // HTML Help controller class, by Vaclav Slavik @@ -22,7 +22,7 @@ #include "wx/dynarray.h" #include "wx/font.h" -class WXDLLIMPEXP_HTML wxHtmlHelpData; +class WXDLLIMPEXP_FWD_HTML wxHtmlHelpData; //-------------------------------------------------------------------------------- // helper classes & structs @@ -97,33 +97,10 @@ struct WXDLLIMPEXP_HTML wxHtmlHelpDataItem WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlHelpDataItem, wxHtmlHelpDataItems, WXDLLIMPEXP_HTML); -#if WXWIN_COMPATIBILITY_2_4 -// old interface to contents and index: -struct wxHtmlContentsItem -{ - wxHtmlContentsItem(); - wxHtmlContentsItem(const wxHtmlHelpDataItem& d); - wxHtmlContentsItem& operator=(const wxHtmlContentsItem& d); - ~wxHtmlContentsItem(); - - int m_Level; - int m_ID; - wxChar *m_Name; - wxChar *m_Page; - wxHtmlBookRecord *m_Book; - - // returns full filename of m_Page, i.e. with book's basePath prepended - wxString GetFullPath() const { return m_Book->GetFullPath(m_Page); } - -private: - bool m_autofree; -}; -#endif - //------------------------------------------------------------------------------ // wxHtmlSearchEngine -// This class takes input streams and scans them for occurence +// This class takes input streams and scans them for occurrence // of keyword(s) //------------------------------------------------------------------------------ @@ -131,7 +108,7 @@ class WXDLLIMPEXP_HTML wxHtmlSearchEngine : public wxObject { public: wxHtmlSearchEngine() : wxObject() {} - ~wxHtmlSearchEngine() {} + virtual ~wxHtmlSearchEngine() {} // Sets the keyword we will be searching for virtual void LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only); @@ -145,7 +122,7 @@ private: bool m_CaseSensitive; bool m_WholeWords; - DECLARE_NO_COPY_CLASS(wxHtmlSearchEngine) + wxDECLARE_NO_COPY_CLASS(wxHtmlSearchEngine); }; @@ -168,9 +145,6 @@ public: const wxString& GetName() { return m_Name; } const wxHtmlHelpDataItem *GetCurItem() const { return m_CurItem; } -#if WXWIN_COMPATIBILITY_2_4 - wxDEPRECATED( wxHtmlContentsItem* GetContentsItem() ); -#endif private: wxHtmlHelpData* m_Data; @@ -183,7 +157,7 @@ private: int m_MaxIndex; // number of files we search // For progress bar: 100*curindex/maxindex = % complete - DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus) + wxDECLARE_NO_COPY_CLASS(wxHtmlSearchStatus); }; class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject @@ -193,7 +167,7 @@ class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject public: wxHtmlHelpData(); - ~wxHtmlHelpData(); + virtual ~wxHtmlHelpData(); // Sets directory where temporary files are stored. // These temp files are index & contents file in binary (much faster to read) @@ -223,14 +197,6 @@ public: const wxHtmlHelpDataItems& GetContentsArray() const { return m_contents; } const wxHtmlHelpDataItems& GetIndexArray() const { return m_index; } -#if WXWIN_COMPATIBILITY_2_4 - // deprecated interface, new interface is arrays-based (see above) - wxDEPRECATED( wxHtmlContentsItem* GetContents() ); - wxDEPRECATED( int GetContentsCnt() ); - wxDEPRECATED( wxHtmlContentsItem* GetIndex() ); - wxDEPRECATED( int GetIndexCnt() ); -#endif - protected: wxString m_tempPath; @@ -240,15 +206,6 @@ protected: wxHtmlHelpDataItems m_contents; // list of all available books and pages wxHtmlHelpDataItems m_index; // list of index itesm -#if WXWIN_COMPATIBILITY_2_4 - // deprecated data structures, set only if GetContents(), GetIndex() - // called - wxHtmlContentsItem* m_cacheContents; - wxHtmlContentsItem* m_cacheIndex; -private: - void CleanCompatibilityData(); -#endif - protected: // Imports .hhp files (MS HTML Help Workshop) bool LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, @@ -258,7 +215,7 @@ protected: // Writes binary book bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f); - DECLARE_NO_COPY_CLASS(wxHtmlHelpData) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpData); }; #endif