fixing wrong version commit

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

diff --git a/interface/wx/cshelp.h b/interface/wx/cshelp.h
index e727f54a71a4d32b8888fefe7fa67bf644db378a..c8af32b8ded50a8dab4c895e472dc950b8a0cc70 100644 (file)
--- a/interface/wx/cshelp.h
+++ b/interface/wx/cshelp.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxHelpProvider
-    @wxheader{cshelp.h}
 
     wxHelpProvider is an abstract class used by a program implementing
     context-sensitive help to show the help text for the given window.
@@ -67,7 +66,7 @@ public:
         May be used to set the same help string for all Cancel buttons in
         the application, for example.
     */
-    virtual wxString GetHelp(const wxWindowBase* window);
+    virtual wxString GetHelp(const wxWindowBase* window) = 0;
 
     /**
         Removes the association between the window pointer and the help text.
@@ -112,15 +111,14 @@ public:
 
         @since 2.7.0
     */
-    virtual bool ShowHelpAtPoint(wxWindowBase* window, const wxPoint point,
-                                   wxHelpEvent::Origin origin);
+    virtual bool ShowHelpAtPoint(wxWindowBase* window, const wxPoint& point,
+                                 wxHelpEvent::Origin origin);
 };
 
 
 
 /**
     @class wxHelpControllerHelpProvider
-    @wxheader{cshelp.h}
 
     wxHelpControllerHelpProvider is an implementation of wxHelpProvider which
     supports both context identifiers and plain text help strings. If the help
@@ -162,7 +160,6 @@ public:
 
 /**
     @class wxContextHelp
-    @wxheader{cshelp.h}
 
     This class changes the cursor to a query and puts the application into a
     'context-sensitive help mode'.  When the user left-clicks on a window
@@ -208,16 +205,18 @@ public:
     /**
         Destroys the context help object.
     */
-    ~wxContextHelp();
+    virtual ~wxContextHelp();
 
     /**
         Puts the application into context-sensitive help mode. @a window is the
         window which will be used to catch events; if @NULL, the top window
-        will be used.  Returns @true if the application was successfully put
-        into context-sensitive help mode.  This function only returns when the
-        event loop has finished.
+        will be used.
+
+        Returns @true if the application was successfully put into
+        context-sensitive help mode.
+        This function only returns when the event loop has finished.
     */
-    bool BeginContextHelp(wxWindow* window = NULL);
+    bool BeginContextHelp(wxWindow* window);
 
     /**
         Ends context-sensitive help mode. Not normally called by the
@@ -230,7 +229,6 @@ public:
 
 /**
     @class wxContextHelpButton
-    @wxheader{cshelp.h}
 
     Instances of this class may be used to add a question mark button that when
     pressed, puts the application into context-help mode. It does this by
@@ -249,9 +247,6 @@ public:
 class wxContextHelpButton : public wxBitmapButton
 {
 public:
-    /// Default constructor.
-    wxContextHelpButton();
-
     /**
         Constructor, creating and showing a context help button.
 
@@ -261,9 +256,11 @@ public:
             Button identifier. Defaults to wxID_CONTEXT_HELP.
         @param pos
             Button position.
+            If ::wxDefaultPosition is specified then a default position is chosen.
         @param size
-            Button size. If wxDefaultSize is specified then the button is sized
-            appropriately for the question mark bitmap.
+            Button size. 
+            If ::wxDefaultSize is specified then the button is sized appropriately 
+            for the question mark bitmap.
         @param style
             Window style.
 
@@ -281,7 +278,6 @@ public:
 
 /**
     @class wxSimpleHelpProvider
-    @wxheader{cshelp.h}
 
     wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
     only plain text help strings, and shows the string associated with the