X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d45bc436954b74745c2f33fdd32b8e813f23431d..6fbcc6cac395cb13dc8395cf72066227563e7bd3:/include/wx/html/helpfrm.h diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index 835a7b9100..6429c3147a 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -12,7 +12,7 @@ #ifndef _WX_HELPFRM_H_ #define _WX_HELPFRM_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "helpfrm.h" #endif @@ -20,6 +20,7 @@ #if wxUSE_WXHTML_HELP +#include "wx/helpbase.h" #include "wx/html/helpdata.h" #include "wx/window.h" #include "wx/frame.h" @@ -33,7 +34,11 @@ #include "wx/stattext.h" #include "wx/html/htmlwin.h" #include "wx/html/htmprint.h" -class WXDLLEXPORT wxButton; + +class WXDLLIMPEXP_CORE wxButton; +class WXDLLIMPEXP_CORE wxTextCtrl; +class WXDLLIMPEXP_CORE wxTreeEvent; +class WXDLLIMPEXP_CORE wxTreeCtrl; // style flags for the Help Frame @@ -66,9 +71,9 @@ struct wxHtmlHelpFrameCfg }; -class WXDLLEXPORT wxHelpControllerBase; +class WXDLLIMPEXP_CORE wxHelpControllerBase; -class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame +class WXDLLIMPEXP_HTML wxHtmlHelpFrame : public wxFrame { DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame) @@ -108,15 +113,16 @@ public: // Displays help window and focuses index. bool DisplayIndex(); - // Searches for keyword. Returns TRUE and display page if found, return - // FALSE otherwise + // Searches for keyword. Returns true and display page if found, return + // false otherwise // Syntax of keyword is Altavista-like: // * words are separated by spaces // (but "\"hello world\"" is only one world "hello world") // * word may be pretended by + or - // (+ : page must contain the word ; - : page can't contain the word) // * if there is no + or - before the word, + is default - bool KeywordSearch(const wxString& keyword); + bool KeywordSearch(const wxString& keyword, + wxHelpSearchMode mode = wxHELP_SEARCH_ALL); void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString) { @@ -133,10 +139,10 @@ public: // call this to let wxHtmlHelpFrame know page changed void NotifyPageChanged(); - + // Refreshes Contents and Index tabs void RefreshLists(); - + protected: void Init(wxHtmlHelpData* data = NULL); @@ -166,6 +172,11 @@ protected: void OnCloseWindow(wxCloseEvent& event); void OnActivate(wxActivateEvent& event); +#ifdef __WXMAC__ + void OnClose(wxCommandEvent& event); + void OnAbout(wxCommandEvent& event); +#endif + // Images: enum { IMG_Book = 0, @@ -224,6 +235,7 @@ protected: int m_hfStyle; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame) }; #endif // wxUSE_WXHTML_HELP