deprecated Initialize/CleanUpClasses

[wxWidgets.git] / include / wx / html / helpctrl.h

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index f5f285d8b77cf50a3862442ff3b1d7232eb35abe..573641ac23b8b2aa6f4099f9c32723f26eb99c3f 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -25,7 +25,7 @@
 
 #define wxID_HTML_HELPFRAME   (wxID_HIGHEST + 1)
 
 
 #define wxID_HTML_HELPFRAME   (wxID_HIGHEST + 1)
 

-class WXDLLEXPORT wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
+class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler

 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
 
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
 


@@ -35,7 +35,8 @@ 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 Display(const wxString& x);
     bool Display(int id);


@@ -57,7 +58,7 @@ public:
     virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize(file); }
     virtual bool Initialize(const wxString& file);
     virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}
     virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize(file); }
     virtual bool Initialize(const wxString& file);
     virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}

-    virtual bool LoadFile(const wxString& file = "");
+    virtual bool LoadFile(const wxString& file = wxT(""));

     virtual bool DisplaySection(int sectionNo);
     virtual bool DisplaySection(const wxString& section) { return Display(section); }
     virtual bool DisplayBlock(long blockNo) { return DisplaySection(blockNo); }
     virtual bool DisplaySection(int sectionNo);
     virtual bool DisplaySection(const wxString& section) { return Display(section); }
     virtual bool DisplayBlock(long blockNo) { return DisplaySection(blockNo); }


@@ -98,6 +99,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