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

Applied patch [ 1161769 ] reference to temp object in carbon/palette.cpp

Browse Source 
Potentially unsafe (and obsolete) constructor removed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-03-30 15:47:29 +00:00
parent 5ba95b7936
commit 4b524c27cc
4 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/mac/carbon/colour.h
View File

@@ -40,7 +40,6 @@ public:
// copy ctors and assignment operators // copy ctors and assignment operators
wxColour( const wxColour& col ); wxColour( const wxColour& col );
wxColour( const wxColour* col );
wxColour& operator = ( const wxColour& col ); wxColour& operator = ( const wxColour& col );
// dtor // dtor

10
src/mac/carbon/colour.cpp
View File

@@ -56,16 +56,6 @@ wxColour::wxColour (const wxColour& col)
memcpy( &m_pixel , &col.m_pixel , 6 ) ; memcpy( &m_pixel , &col.m_pixel , 6 ) ;
} }
wxColour::wxColour (const wxColour* col)
{
m_red = col->m_red;
m_green = col->m_green;
m_blue = col->m_blue;
m_isInit = col->m_isInit;
memcpy( &m_pixel , &col->m_pixel , 6 ) ;
}
wxColour& wxColour::operator =(const wxColour& col) wxColour& wxColour::operator =(const wxColour& col)
{ {
m_red = col.m_red; m_red = col.m_red;

4
src/mac/carbon/palette.cpp
View File

@@ -83,7 +83,7 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons
for ( int i = 0 ; i < M_PALETTEDATA->m_count ; ++i ) for ( int i = 0 ; i < M_PALETTEDATA->m_count ; ++i )
{ {
const wxColour& col = &M_PALETTEDATA->m_palette[i] ; const wxColour& col = M_PALETTEDATA->m_palette[i] ;
currentdiff = abs ( col.Red() - red ) + abs( col.Green() - green ) + abs ( col.Blue() - blue ) ; currentdiff = abs ( col.Red() - red ) + abs( col.Green() - green ) + abs ( col.Blue() - blue ) ;
if ( currentdiff < bestdiff ) if ( currentdiff < bestdiff )
{ {
@@ -105,7 +105,7 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
if (index < 0 || index >= M_PALETTEDATA->m_count) if (index < 0 || index >= M_PALETTEDATA->m_count)
return FALSE; return FALSE;
const wxColour& col = &M_PALETTEDATA->m_palette[index] ; const wxColour& col = M_PALETTEDATA->m_palette[index] ;
*red = col.Red() ; *red = col.Red() ;
*green = col.Green() ; *green = col.Green() ;
*blue = col.Blue() ; *blue = col.Blue() ;

4
src/mac/carbon/statbrma.cpp
View File

@@ -133,7 +133,7 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
if ( MacIsReallyHilited() ) if ( MacIsReallyHilited() )
{ {
wxPen white( wxWHITE , 1 , wxSOLID ) ; wxPen white( *wxWHITE , 1 , wxSOLID ) ;
if (major >= 10 ) if (major >= 10 )
{ {
//Finder statusbar border color: (Project builder similar is 9B9B9B) //Finder statusbar border color: (Project builder similar is 9B9B9B)
@@ -144,7 +144,7 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
} }
else else
{ {
wxPen black( wxBLACK , 1 , wxSOLID ) ; wxPen black( *wxBLACK , 1 , wxSOLID ) ;
dc.SetPen(black); dc.SetPen(black);
} }
dc.DrawLine(0, 0 , dc.DrawLine(0, 0 ,