Move code removing "-psn_xxx" command line arguments to common code.

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

diff --git a/interface/wx/colordlg.h b/interface/wx/colordlg.h
index 1ed5b25cb893119d7c46c84da6d3e3d2ae0e5133..7d1faa87e3cca51ad866dee3bc1fb13a5cfb705a 100644 (file)
--- a/interface/wx/colordlg.h
+++ b/interface/wx/colordlg.h
@@ -2,13 +2,11 @@
 // Name:        colordlg.h
 // Purpose:     interface of wxColourDialog
 // Author:      wxWidgets team
 // Name:        colordlg.h
 // Purpose:     interface of wxColourDialog
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxColourDialog
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxColourDialog

-    @wxheader{colordlg.h}

 
     This class represents the colour chooser dialog.
 
 
     This class represents the colour chooser dialog.
 


@@ -26,7 +24,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).


@@ -38,7 +36,7 @@ public:
     /**
         Destructor.
     */
     /**
         Destructor.
     */

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

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


@@ -48,13 +46,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();

 };
 
 
 };
 
 


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

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

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