Removed wxPG_EX_LEGACY_VALIDATORS

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

diff --git a/interface/wx/cshelp.h b/interface/wx/cshelp.h
index e727f54a71a4d32b8888fefe7fa67bf644db378a..8c224ac12058d27803880f24ffe0bd09ba166e76 100644 (file)
--- a/interface/wx/cshelp.h
+++ b/interface/wx/cshelp.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxHelpProvider
 
 /**
     @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.
 
     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.
     */
         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.
 
     /**
         Removes the association between the window pointer and the help text.


@@ -112,15 +111,14 @@ public:
 
         @since 2.7.0
     */
 
         @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
 };
 
 
 
 /**
     @class wxHelpControllerHelpProvider

-    @wxheader{cshelp.h}

 
     wxHelpControllerHelpProvider is an implementation of wxHelpProvider which
     supports both context identifiers and plain text help strings. If the help
 
     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
 
 /**
     @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
 
     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.
     */
     /**
         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
 
     /**
         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
 
     /**
         Ends context-sensitive help mode. Not normally called by the


@@ -230,7 +229,6 @@ public:
 
 /**
     @class wxContextHelpButton
 
 /**
     @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
 
     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:
 class wxContextHelpButton : public wxBitmapButton
 {
 public:

-    /// Default constructor.
-    wxContextHelpButton();
-

     /**
         Constructor, creating and showing a context help button.
 
     /**
         Constructor, creating and showing a context help button.
 


@@ -281,7 +276,6 @@ public:
 
 /**
     @class wxSimpleHelpProvider
 
 /**
     @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
 
     wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
     only plain text help strings, and shows the string associated with the