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

Applied patch [ 828303 ] Slight wxColour cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-12-11 10:10:40 +00:00
parent 12ac619f42
commit aad6765cbd
23 changed files with 303 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mgl/colour.cpp
View File

@@ -32,7 +32,7 @@ void wxColour::Init()
m_red =
m_blue =
m_green = 0;
m_isInit = FALSE;
m_isInit = false;
}
wxColour::wxColour(const wxColour& col)
@@ -51,15 +51,18 @@ wxColour& wxColour::operator =(const wxColour& col)
void wxColour::InitFromName(const wxString& name)
{
wxColour *col = wxTheColourDatabase->Find(name);
if ( col.Ok() )
if ( wxTheColourDatabase )
{
*this = col;
}
else
{
Init();
wxColour col = wxTheColourDatabase->Find(name);
if ( col.Ok() )
{
*this = col;
return;
}
}
// leave invalid
Init();
}
wxColour::~wxColour()
@@ -71,5 +74,5 @@ void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
m_red = r;
m_green = g;
m_blue = b;
m_isInit = TRUE;
m_isInit = true;
}