Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / interface / wx / help.h

diff --git a/interface/wx/help.h b/interface/wx/help.h
index 1c15a76ec02d6fa1786cc44d3377ae65bb15f8df..88740c4c70f999879e63bff18571a72a4957c2e2 100644 (file)
--- a/interface/wx/help.h
+++ b/interface/wx/help.h
@@ -2,7 +2,6 @@
 // Name:        help.h
 // Purpose:     interface of wxHelpController
 // Author:      wxWidgets team
 // Name:        help.h
 // Purpose:     interface of wxHelpController
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -108,7 +107,7 @@ public:
           See also the help sample for notes on how to specify section numbers for
           various help file formats.
     */
           See also the help sample for notes on how to specify section numbers for
           various help file formats.
     */

-    virtual bool DisplaySection(int sectionNo) = 0;;
+    virtual bool DisplaySection(int sectionNo) = 0;

 
     /**
         Displays the text in a popup window, if possible.
 
     /**
         Displays the text in a popup window, if possible.


@@ -199,15 +198,15 @@ public:
     /**
         Set the parameters of the frame window.
 
     /**
         Set the parameters of the frame window.
 

-        For wxHtmlHelpController, @a title specifies the title string format
-        (with @c %s being replaced by the actual page title) and @a size and
-        @a position specify the geometry of the frame.
+        For wxHtmlHelpController, @a titleFormat specifies the title string
+        format (with @c %s being replaced by the actual page title) and @a size
+        and @a position specify the geometry of the frame.

 
         For all other help controllers this function has no effect.
 
         Finally, @a newFrameEachTime is always ignored currently.
     */
 
         For all other help controllers this function has no effect.
 
         Finally, @a newFrameEachTime is always ignored currently.
     */

-    virtual void SetFrameParameters(const wxString& title,
+    virtual void SetFrameParameters(const wxString& titleFormat,

                                     const wxSize& size,
                                     const wxPoint& pos = wxDefaultPosition,
                                     bool newFrameEachTime = false);
                                     const wxSize& size,
                                     const wxPoint& pos = wxDefaultPosition,
                                     bool newFrameEachTime = false);