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

compilation fix after operator==() removal

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/motif/bmpmotif.cpp
View File

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

2
src/motif/dc.cpp
View File

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

2
src/motif/dcclient.cpp
View File

@@ -1690,7 +1690,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple); XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
} }
else if (m_currentStipple.Ok() 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()); XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());

2
src/motif/utils.cpp
View File

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