avoid infinite recursion for richtooltops, (hopefully) fixes #15070

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

diff --git a/interface/wx/colordlg.h b/interface/wx/colordlg.h
index 531b075122843a1e0e0deea10b346068a26131b6..543698e037aafa8164a705a14eb7a46bdea442df 100644 (file)
--- a/interface/wx/colordlg.h
+++ b/interface/wx/colordlg.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxColourDialog
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxColourDialog
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

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

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


@@ -25,7 +25,7 @@ public:
         of colour data, which will be copied to the colour dialog's colour
         data.
 
         of colour data, which will be copied to the colour dialog's colour
         data.
 

-        Custom colours from colour data object will be be used in the dialog's
+        Custom colours from colour data object will be used in the dialog's

         colour palette. Invalid entries in custom colours list will be ignored
         on some platforms(GTK) or replaced with white colour on platforms where
         custom colours palette has fixed size (MSW).
         colour palette. Invalid entries in custom colours list will be ignored
         on some platforms(GTK) or replaced with white colour on platforms where
         custom colours palette has fixed size (MSW).


@@ -37,7 +37,7 @@ public:
     /**
         Destructor.
     */
     /**
         Destructor.
     */

-    ~wxColourDialog();
+    virtual ~wxColourDialog();

 
     /**
         Same as wxColourDialog().
 
     /**
         Same as wxColourDialog().


@@ -47,13 +47,13 @@ public:
     /**
         Returns the colour data associated with the colour dialog.
     */
     /**
         Returns the colour data associated with the colour dialog.
     */

-    wxColourData GetColourData();
+    wxColourData& GetColourData();

 
     /**
         Shows the dialog, returning wxID_OK if the user pressed OK, and
         wxID_CANCEL otherwise.
     */
 
     /**
         Shows the dialog, returning wxID_OK if the user pressed OK, and
         wxID_CANCEL otherwise.
     */

-    int ShowModal();
+    virtual int ShowModal();

 };
 
 
 };
 
 


@@ -62,7 +62,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
 // Global functions/macros
 // ============================================================================
 

-/** @ingroup group_funcmacro_dialog */
+/** @addtogroup group_funcmacro_dialog */

 //@{
 
 /**
 //@{
 
 /**