X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18680f86512504f043ad5d0b222afc7be87aa3e9..03c6117e8f6c958c1bc2602132ded643fc703cbf:/src/motif/bmpmotif.cpp

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index f79d04c32b..525bc355a0 100644
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -12,11 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/motif/bmpmotif.h"
 
 #ifndef WX_PRECOMP
@@ -70,7 +65,7 @@ wxBitmapCache::~wxBitmapCache()
 
 void wxBitmapCache::SetBitmap( const wxBitmap& bitmap )
 {
-    if( m_bitmap != bitmap )
+    if ( !m_bitmap.IsSameAs(bitmap) )
     {
         InvalidateCache();
         m_bitmap = bitmap;
@@ -125,7 +120,7 @@ WXPixmap wxBitmapCache::GetPixmapFromCache(WXWidget w)
     while( XmIsGadget( widget ) )
         widget = XtParent( widget );
 
-    Pixel fg, bg;
+    WXPixel fg, bg;
     XtVaGetValues( widget,
                    XmNbackground, &bg,
                    XmNforeground, &fg,