Fix incorrect comparison

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

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 4275b214fb047af2168528708287642344c2b72f..d9317536b4f9cbe425035fdf05ed8c0b0f1506f8 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:
 // Purpose:     wxBitmap
 // Author:      Julian Smart, originally in bitmap.cpp
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,9 +17,12 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/defs.h"

 #include "wx/motif/bmpmotif.h"
 
 #include "wx/motif/bmpmotif.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/math.h"
+#endif
+

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif


@@ -38,8 +37,6 @@
     #include <X11/xpm.h>
 #endif
 
     #include <X11/xpm.h>
 #endif
 

-#include "wx/math.h"
-

 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 static inline wxCharBuffer GetCacheImageName(WXImage image)
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 static inline wxCharBuffer GetCacheImageName(WXImage image)


@@ -128,7 +125,7 @@ WXPixmap wxBitmapCache::GetPixmapFromCache(WXWidget w)
     while( XmIsGadget( widget ) )
         widget = XtParent( widget );
 
     while( XmIsGadget( widget ) )
         widget = XtParent( widget );
 

-    Pixel fg, bg;
+    WXPixel fg, bg;

     XtVaGetValues( widget,
                    XmNbackground, &bg,
                    XmNforeground, &fg,
     XtVaGetValues( widget,
                    XmNbackground, &bg,
                    XmNforeground, &fg,