compilation fix after operator==() removal

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-30 22:58:02 +00:00
parent ebdb3bc7e0
commit f536319dee
4 changed files with 4 additions and 4 deletions

View File

@@ -70,7 +70,7 @@ wxBitmapCache::~wxBitmapCache()
void wxBitmapCache::SetBitmap( const wxBitmap& bitmap )
{
if( m_bitmap != bitmap )
if ( !m_bitmap.IsSameAs(bitmap) )
{
InvalidateCache();
m_bitmap = bitmap;

View File

@@ -49,7 +49,7 @@ void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useM
wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
wxMemoryDC memDC;
memDC.SelectObject(bitmap);
memDC.SelectObjectAsSource(bitmap);
#if 0
// Not sure if we need this. The mask should leave the masked areas as per

View File

@@ -1690,7 +1690,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
}
else if (m_currentStipple.Ok()
&& ((m_currentStipple != oldStipple) || !GET_OPTIMIZATION))
&& ((!m_currentStipple.IsSameAs(oldStipple)) || !GET_OPTIMIZATION))
{
XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());

View File

@@ -971,7 +971,7 @@ wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, const wxColour& colour)
wxMemoryDC destDC;
wxMemoryDC srcDC;
srcDC.SelectObject(bitmap);
srcDC.SelectObjectAsSource(bitmap);
destDC.SelectObject(newBitmap);
wxBrush brush(colour, wxSOLID);