projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sorry, should be a __UNIX__ test
[wxWidgets.git]
/
include
/
wx
/
html
/
helpctrl.h
diff --git
a/include/wx/html/helpctrl.h
b/include/wx/html/helpctrl.h
index e71db3db4c62a0175f4991a02f6b19214cf59d32..bb7e1e21265c6f0192a0f67fc4e76d89b3330ac5 100644
(file)
--- a/
include/wx/html/helpctrl.h
+++ b/
include/wx/html/helpctrl.h
@@
-14,18
+14,18
@@
#include "wx/defs.h"
#include "wx/defs.h"
-#if defined(__GNUG__) && !defined(
__APPLE__
)
+#if defined(__GNUG__) && !defined(
NO_GCC_PRAGMA
)
#pragma interface "helpctrl.h"
#endif
#if wxUSE_WXHTML_HELP
#pragma interface "helpctrl.h"
#endif
#if wxUSE_WXHTML_HELP
-#include "wx/html/helpfrm.h"
#include "wx/helpbase.h"
#include "wx/helpbase.h"
+#include "wx/html/helpfrm.h"
#define wxID_HTML_HELPFRAME (wxID_HIGHEST + 1)
#define wxID_HTML_HELPFRAME (wxID_HIGHEST + 1)
-class WXDLL
EXPORT
wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
+class WXDLL
IMPEXP_HTML
wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
{
DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
{
DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
@@
-35,13
+35,15
@@
public:
void SetTitleFormat(const wxString& format);
void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }
void SetTitleFormat(const wxString& format);
void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }
- bool AddBook(const wxString& book, bool show_wait_msg = FALSE);
+ bool AddBook(const wxString& book_url, bool show_wait_msg = false);
+ bool AddBook(const wxFileName& book_file, bool show_wait_msg = false);
bool Display(const wxString& x);
bool Display(int id);
bool DisplayContents();
bool DisplayIndex();
bool Display(const wxString& x);
bool Display(int id);
bool DisplayContents();
bool DisplayIndex();
- bool KeywordSearch(const wxString& keyword);
+ bool KeywordSearch(const wxString& keyword,
+ wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
@@
-66,7
+68,7
@@
public:
virtual void SetFrameParameters(const wxString& title,
const wxSize& size,
const wxPoint& pos = wxDefaultPosition,
virtual void SetFrameParameters(const wxString& title,
const wxSize& size,
const wxPoint& pos = wxDefaultPosition,
- bool newFrameEachTime =
FALSE
);
+ bool newFrameEachTime =
false
);
/// Obtains the latest settings used by the help frame and the help
/// frame.
virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
/// Obtains the latest settings used by the help frame and the help
/// frame.
virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
@@
-77,7
+79,7
@@
public:
wxHtmlHelpData *GetHelpData() { return &m_helpData; }
virtual bool Quit() ;
wxHtmlHelpData *GetHelpData() { return &m_helpData; }
virtual bool Quit() ;
- virtual void OnQuit() {}
;
+ virtual void OnQuit() {}
void OnCloseFrame(wxCloseEvent& evt);
void OnCloseFrame(wxCloseEvent& evt);
@@
-98,6
+100,8
@@
protected:
wxString m_titleFormat;
int m_FrameStyle;
// DECLARE_EVENT_TABLE()
wxString m_titleFormat;
int m_FrameStyle;
// DECLARE_EVENT_TABLE()
+
+ DECLARE_NO_COPY_CLASS(wxHtmlHelpController)
};
#endif // wxUSE_WXHTML_HELP
};
#endif // wxUSE_WXHTML_HELP