compilation fix after operator==() removal

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index d9317536b4f9cbe425035fdf05ed8c0b0f1506f8..155adc1cf4a35051668b40623793396e7bbb8fe6 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -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;

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index 884ac2e7e6185db2ef3d7a19facba5e4b83d5633..939442bd32b4d5650b470603cb968415c05da26d 100644 (file)
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -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

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index cb3cfbee407b9be8f46a40191b5796e078e04bc6..2013cc7dbe6d0502d8f67e6ab3ddb09a42b44ef0 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -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());
 

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 84bc1a6d9a527152998628c5d26243911d841e32..c3b452d42b46ec1e82c17fa6aac1fca3a9cb5bef 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -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);