Make wxDataObjectComposite::GetObject() public.

[wxWidgets.git] / interface / wx / html / helpwnd.h

diff --git a/interface/wx/html/helpwnd.h b/interface/wx/html/helpwnd.h
index e175f4d14c678039e23fa7c9b9c1d8dccd14f94c..49e3faaa2dc19eb9e12350d9f67f36c38ff312c1 100644 (file)
--- a/interface/wx/html/helpwnd.h
+++ b/interface/wx/html/helpwnd.h
@@ -23,7 +23,7 @@
         m_embeddedHtmlHelp.SetHelpWindow(m_embeddedHelpWindow);
         m_embeddedHelpWindow->Create(this, wxID_ANY, wxDefaultPosition, GetClientSize(),
                                      wxTAB_TRAVERSAL|wxBORDER_NONE, wxHF_DEFAULT_STYLE);
         m_embeddedHtmlHelp.SetHelpWindow(m_embeddedHelpWindow);
         m_embeddedHelpWindow->Create(this, wxID_ANY, wxDefaultPosition, GetClientSize(),
                                      wxTAB_TRAVERSAL|wxBORDER_NONE, wxHF_DEFAULT_STYLE);

-        m_embeddedHtmlHelp.AddBook(wxFileName(_T("doc.zip")));
+        m_embeddedHtmlHelp.AddBook(wxFileName(wxT("doc.zip")));

     @endcode
 
     You should pass the style wxHF_EMBEDDED to the style parameter of
     @endcode
 
     You should pass the style wxHF_EMBEDDED to the style parameter of


@@ -51,16 +51,6 @@ public:
                      int helpStyle = wxHF_DEFAULT_STYLE,
                      wxHtmlHelpData* data = NULL);
 
                      int helpStyle = wxHF_DEFAULT_STYLE,
                      wxHtmlHelpData* data = NULL);
 

-    /**
-        You may override this virtual method to add more buttons to the help window's
-        toolbar. @a toolBar is a pointer to the toolbar and @a style is the style
-        flag as passed to the Create() method.
-
-        wxToolBar::Realize is called immediately after returning from this function.
-        See @c samples/html/helpview for an example.
-    */
-    virtual void AddToolbarButtons(wxToolBar* toolBar, int style);
-

     /**
         Creates the help window. See @ref wxHtmlHelpWindow() "the constructor"
         for a description of the parameters.
     /**
         Creates the help window. See @ref wxHtmlHelpWindow() "the constructor"
         for a description of the parameters.


@@ -70,11 +60,6 @@ public:
                 const wxSize& size = wxDefaultSize, int style = wxTAB_TRAVERSAL|wxBORDER_NONE,
                 int helpStyle = wxHF_DEFAULT_STYLE);
 
                 const wxSize& size = wxDefaultSize, int style = wxTAB_TRAVERSAL|wxBORDER_NONE,
                 int helpStyle = wxHF_DEFAULT_STYLE);
 

-    /**
-        Creates search panel.
-    */
-    void CreateSearch();
-

     /**
         Displays page x.
         If not found it will give the user the choice of searching books.
     /**
         Displays page x.
         If not found it will give the user the choice of searching books.


@@ -125,13 +110,6 @@ public:
     void ReadCustomization(wxConfigBase* cfg,
                            const wxString& path = wxEmptyString);
 
     void ReadCustomization(wxConfigBase* cfg,
                            const wxString& path = wxEmptyString);
 

-    /**
-        Sets the frame's title format.
-
-        @a format must contain exactly one "%s" (it will be replaced by the page title).
-    */
-    void SetTitleFormat(const wxString& format);
-

     /**
         Associates a wxConfig object with the help window. It is recommended that you
         use wxHtmlHelpController::UseConfig instead.
     /**
         Associates a wxConfig object with the help window. It is recommended that you
         use wxHtmlHelpController::UseConfig instead.


@@ -147,8 +125,28 @@ public:
     void WriteCustomization(wxConfigBase* cfg,
                             const wxString& path = wxEmptyString);
 
     void WriteCustomization(wxConfigBase* cfg,
                             const wxString& path = wxEmptyString);
 

+    /**
+        Refresh all panels. This is necessary if a new book was added.
+    */
+    void RefreshLists();
+

 protected:
 
 protected:
 

+    /**
+        Creates search panel.
+    */
+    void CreateSearch();
+
+    /**
+        You may override this virtual method to add more buttons to the help window's
+        toolbar. @a toolBar is a pointer to the toolbar and @a style is the style
+        flag as passed to the Create() method.
+
+        wxToolBar::Realize is called immediately after returning from this function.
+        See @c samples/html/helpview for an example.
+    */
+    virtual void AddToolbarButtons(wxToolBar* toolBar, int style);
+

     /**
         Creates contents panel. (May take some time.)
     */
     /**
         Creates contents panel. (May take some time.)
     */


@@ -158,10 +156,5 @@ protected:
         Creates index panel. (May take some time.)
     */
     void CreateIndex();
         Creates index panel. (May take some time.)
     */
     void CreateIndex();

-
-    /**
-        Refresh all panels. This is necessary if a new book was added.
-    */
-    void RefreshLists();

 };
 
 };