X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..36a0190ebd5bd9a7302f60f6dcd608b80574e21c:/interface/wx/colordlg.h diff --git a/interface/wx/colordlg.h b/interface/wx/colordlg.h index 531b075122..7d1faa87e3 100644 --- a/interface/wx/colordlg.h +++ b/interface/wx/colordlg.h @@ -2,8 +2,7 @@ // Name: colordlg.h // Purpose: interface of wxColourDialog // Author: wxWidgets team -// RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** @@ -25,7 +24,7 @@ public: 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). @@ -37,7 +36,7 @@ public: /** Destructor. */ - ~wxColourDialog(); + virtual ~wxColourDialog(); /** Same as wxColourDialog(). @@ -47,13 +46,13 @@ public: /** 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. */ - int ShowModal(); + virtual int ShowModal(); }; @@ -62,7 +61,7 @@ public: // Global functions/macros // ============================================================================ -/** @ingroup group_funcmacro_dialog */ +/** @addtogroup group_funcmacro_dialog */ //@{ /**