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:
@@ -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;
|
||||
|
@@ -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
|
||||
|
@@ -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());
|
||||
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user