X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e0071d949c302b17d6459de98c5cf42600d96fe..a255c995a18e60ff48fd1b337b2ce0a13843421d:/src/motif/bmpmotif.cpp?ds=sidebyside

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index d9317536b4..a04c74e4cb 100644
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, originally in bitmap.cpp
 // Modified by:
 // Created:     25/03/2003
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,11 +11,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
@@ -41,7 +35,7 @@ Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 static inline wxCharBuffer GetCacheImageName(WXImage image)
 {
-    return wxString::Format(_T("wxBitmap_%p"), image).ToAscii();
+    return wxString::Format(wxT("wxBitmap_%p"), image).ToAscii();
 }
 
 wxBitmapCache::~wxBitmapCache()
@@ -70,7 +64,7 @@ wxBitmapCache::~wxBitmapCache()
 
 void wxBitmapCache::SetBitmap( const wxBitmap& bitmap )
 {
-    if( m_bitmap != bitmap )
+    if ( !m_bitmap.IsSameAs(bitmap) )
     {
         InvalidateCache();
         m_bitmap = bitmap;
@@ -79,7 +73,7 @@ void wxBitmapCache::SetBitmap( const wxBitmap& bitmap )
         {
             XmUninstallImage( (XImage*)m_image );
             XtFree( (char*)(XImage*)m_image );
-            m_image = (WXImage*)NULL;
+            m_image = NULL;
         }
     }
 }
@@ -268,7 +262,7 @@ XCreateInsensitivePixmap( Display *display, Pixmap pixmap )
     stipple = XCreateBitmapFromData( display, pixmap, stipple_data, 16, 16 );
     if ( 0 != stipple )
     {
-        gc = XCreateGC( display, pixmap, (XtGCMask)0, (XGCValues*)NULL );
+        gc = XCreateGC( display, pixmap, (XtGCMask)0, NULL );
         if ( NULL != gc )
         {
             /* Create an identical copy of the argument pixmap.