Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxString instead of wxChar* in wxColour::Set/FromString

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-30 10:29:12 +00:00
parent 092793cb6d
commit e86d4e59c1
9 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/colour.h
View File

@@ -27,8 +27,7 @@ class WXDLLEXPORT wxColour;
ChannelType alpha = wxALPHA_OPAQUE ) \
{ Set(red, green, blue, alpha); } \
wxColour( unsigned long colRGB ) { Set(colRGB); } \
wxColour(const wxString &colourName) { Set(colourName); } \
wxColour(const wxChar *colourName) { Set(colourName); }
wxColour(const wxString& colourName) { Set(colourName); }
// flags for wxColour -> wxString conversion (see wxColour::GetAsString)
@@ -74,9 +73,6 @@ public:
{ InitRGBA(red,green,blue, alpha); }
// implemented in colourcmn.cpp
bool Set(const wxChar *str)
{ return FromString(str); }
bool Set(const wxString &str)
{ return FromString(str); }
@@ -120,7 +116,7 @@ protected:
virtual void
InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) = 0;
virtual bool FromString(const wxChar *s);
virtual bool FromString(const wxString& s);
};