From ebd75440d5b792f76cd0179e84e7e4ee2f942ecb Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sat, 15 Nov 2008 11:49:24 +0000 Subject: [PATCH] removed redundant wxClassName:: prefix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/cmndata.h | 17 ++++++++++++----- interface/wx/xrc/xmlres.h | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/interface/wx/cmndata.h b/interface/wx/cmndata.h index bdc7f4c421..4fd908859e 100644 --- a/interface/wx/cmndata.h +++ b/interface/wx/cmndata.h @@ -423,15 +423,22 @@ public: */ void SetCustomColour(int i, const wxColour& colour); + /** + Converts the colours saved in this class in a string form, separing + the various colours with a comma. + */ + wxString ToString() const; + + /** + Decodes the given string, which should be in the same format returned + by ToString(), and sets the internal colours. + */ + bool FromString(const wxString& str); + /** Assignment operator for the colour data. */ wxColourData& operator =(const wxColourData& data); - - - /** @todo document these */ - wxString wxColourData::ToString() const; - bool wxColourData::FromString(const wxString& str); }; diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h index 93c10b126a..14d9df782e 100644 --- a/interface/wx/xrc/xmlres.h +++ b/interface/wx/xrc/xmlres.h @@ -120,7 +120,7 @@ public: @since 2.9.0 */ - static wxString wxXmlResource::FindXRCIDById(int numId); + static wxString FindXRCIDById(int numId); /** Gets the global resources object or creates one if none exists.