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

8
src/gtk1/colour.cpp
View File

@@ -37,7 +37,7 @@ public:
m_color.blue = 0;
m_color.pixel = 0;
m_colormap = (GdkColormap *) NULL;
m_hasPixel = FALSE;
m_hasPixel = false;
}
wxColourRefData(const wxColourRefData& data)
@@ -207,10 +207,10 @@ wxColour::~wxColour()
bool wxColour::operator == ( const wxColour& col ) const
{
if (m_refData == col.m_refData)
return TRUE;
return true;
if (!m_refData || !col.m_refData)
return FALSE;
return false;
GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
@@ -239,7 +239,7 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
M_COLDATA->m_color.pixel = 0;
M_COLDATA->m_colormap = (GdkColormap*) NULL;
M_COLDATA->m_hasPixel = FALSE;
M_COLDATA->m_hasPixel = false;
}
unsigned char wxColour::Red() const