Fixed wxScrolledWindow references to properly link (and appropriately changed others...

[wxWidgets.git] / src / motif / bmpmotif.cpp

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 4275b214fb047af2168528708287642344c2b72f..525bc355a0d45256ccd34f556c516fb79a2de0aa 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/motif/bmpmotif.cpp
 // Purpose:     wxBitmap
 // Author:      Julian Smart, originally in bitmap.cpp
 // Modified by:
@@ -9,21 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bmpmotif.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
-#include "wx/defs.h"
 #include "wx/motif/bmpmotif.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/math.h"
+#endif
+
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
@@ -38,8 +32,6 @@
     #include <X11/xpm.h>
 #endif
 
-#include "wx/math.h"
-
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 static inline wxCharBuffer GetCacheImageName(WXImage image)
@@ -73,7 +65,7 @@ wxBitmapCache::~wxBitmapCache()
 
 void wxBitmapCache::SetBitmap( const wxBitmap& bitmap )
 {
-    if( m_bitmap != bitmap )
+    if ( !m_bitmap.IsSameAs(bitmap) )
     {
         InvalidateCache();
         m_bitmap = bitmap;
@@ -128,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,