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

General tidy-up (mainly typecasts) to allow the use of the SGI native

Browse Source 
compilers (tested on Irix 6.5 with -mips3 -n32).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (RO)
1998-08-23 03:22:56 +00:00
parent cb6780ff01
commit c67daf8777
215 changed files with 1654 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/colour.cpp
View File

@@ -44,7 +44,7 @@ wxColourRefData::wxColourRefData(void)
m_color.green = 0;
m_color.blue = 0;
m_color.pixel = 0;
m_colormap = NULL;
m_colormap = (GdkColormap *) NULL;
m_hasPixel = FALSE;
}
@@ -81,7 +81,7 @@ wxColour::wxColour( char red, char green, char blue )
wxColour::wxColour( const wxString &colourName )
{
wxNode *node = NULL;
wxNode *node = (wxNode *) NULL;
if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
{
wxColour *col = (wxColour*)node->Data();
@@ -95,7 +95,7 @@ wxColour::wxColour( const wxString &colourName )
{
wxFAIL_MSG( "wxColour: couldn't find colour" );
delete m_refData;
m_refData = NULL;
m_refData = (wxObjectRefData *) NULL;
}
}
}
@@ -124,7 +124,7 @@ wxColour& wxColour::operator = ( const wxColour& col )
wxColour& wxColour::operator = ( const wxString& colourName )
{
UnRef();
wxNode *node = NULL;
wxNode *node = (wxNode *) NULL;
if ((wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
{
wxColour *col = (wxColour*)node->Data();
@@ -137,7 +137,7 @@ wxColour& wxColour::operator = ( const wxString& colourName )
{
wxFAIL_MSG( "wxColour: couldn't find colour" );
delete m_refData;
m_refData = NULL;
m_refData = (wxObjectRefData *) NULL;
}
}
return *this;
@@ -219,7 +219,7 @@ int wxColour::GetPixel(void)
GdkColor *wxColour::GetColor(void)
{
if (!Ok()) return NULL;
if (!Ok()) return (GdkColor *) NULL;
return &M_COLDATA->m_color;
}