Remove non-existent wxPGChoices methods from the documentation.

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

diff --git a/interface/wx/help.h b/interface/wx/help.h
index adfc80278418a29d80488fa7f8c41a159ade9daf..8a3d0e4899ccef832dbe9a7cdc9ad640e5e6666a 100644 (file)
--- a/interface/wx/help.h
+++ b/interface/wx/help.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxHelpController
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxHelpController
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -38,10 +38,10 @@
     The following help controller classes are defined:
     - wxWinHelpController, for controlling Windows Help.
     - wxCHMHelpController, for controlling MS HTML Help. To use this, you need to
     The following help controller classes are defined:
     - wxWinHelpController, for controlling Windows Help.
     - wxCHMHelpController, for controlling MS HTML Help. To use this, you need to

-      set wxUSE_MS_HTML_HELP to 1 in setup.h and have htmlhelp.h header from
-      Microsoft's HTML Help kit (you don't need VC++ specific htmlhelp.lib
+      set wxUSE_MS_HTML_HELP to 1 in setup.h and have the htmlhelp.h header from
+      Microsoft's HTML Help kit. (You don't need the VC++-specific htmlhelp.lib

       because wxWidgets loads necessary DLL at runtime and so it works with all
       because wxWidgets loads necessary DLL at runtime and so it works with all

-      compilers).
+      compilers.)

     - wxBestHelpController, for controlling MS HTML Help or, if Microsoft's runtime
       is not available, wxHtmlHelpController. You need to provide @b both CHM and
       HTB versions of the help file. For wxMSW only.
     - wxBestHelpController, for controlling MS HTML Help or, if Microsoft's runtime
       is not available, wxHtmlHelpController. You need to provide @b both CHM and
       HTB versions of the help file. For wxMSW only.


@@ -205,7 +205,7 @@ public:
 
         wxHtmlHelpController ignores this call.
     */
 
         wxHtmlHelpController ignores this call.
     */

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

 
     /**
         Overridable member called when this application's viewer is quit by the user.
 
     /**
         Overridable member called when this application's viewer is quit by the user.


@@ -220,7 +220,7 @@ public:
     virtual bool Quit();
 
     /**
     virtual bool Quit();
 
     /**

-        For wxHtmlHelpController, the title is set (again with %s indicating the
+        For wxHtmlHelpController, the title is set (with %s indicating the

         page title) and also the size and position of the frame if the frame is
         already open. @a newFrameEachTime is ignored.
 
         page title) and also the size and position of the frame if the frame is
         already open. @a newFrameEachTime is ignored.