Made wxWindow::HasScrollbar() do what it says.

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

diff --git a/interface/wx/html/helpwnd.h b/interface/wx/html/helpwnd.h
index 690d799c7ae4d7f0c0e6cce6f3b96862ce7f8ae5..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


@@ -110,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.