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

6
include/wx/cocoa/colour.h
View File

@@ -35,8 +35,7 @@ public:
ChannelType alpha = wxALPHA_OPAQUE )
{ Init(); Set(red, green, blue, alpha); }
wxColour(unsigned long colRGB) { Init(); Set(colRGB); }
wxColour(const wxString &colourName) { Init(); Set(colourName); }
wxColour(const wxChar *colourName) { Init(); Set(colourName); }
wxColour(const wxString& colourName) { Init(); Set(colourName); }
// initialization using existing NSColor
wxColour( WX_NSColor aColor );
@@ -80,9 +79,6 @@ public:
unsigned char alpha = wxALPHA_OPAQUE)
{ wxColourBase::Set(red, green, blue, alpha); }
bool Set(const wxChar *str)
{ return wxColourBase::Set(str); }
bool Set(const wxString &str)
{ return wxColourBase::Set(str); }