X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8508ea8a890c90e6e72b2579780ca2ccbf40270..921c65ed3d889117c600387cebb0bce2470cff8e:/src/motif/bmpmotif.cpp

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index c0b958ab78..d0f70c18c4 100644
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -9,12 +9,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#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"
@@ -33,7 +37,8 @@
 #if wxHAVE_LIB_XPM
     #include <X11/xpm.h>
 #endif
-#include <math.h>
+
+#include "wx/math.h"
 
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
@@ -99,7 +104,7 @@ void wxBitmapCache::CreateImageIfNeeded( WXWidget w )
                 (WXDisplay*)wxGetDisplay();
 
     XImage *ximage = XGetImage( (Display*)m_display,
-                                (Drawable)m_bitmap.GetPixmap(),
+                                (Drawable)m_bitmap.GetDrawable(),
                                 0, 0,
                                 m_bitmap.GetWidth(), m_bitmap.GetHeight(),
                                 AllPlanes, ZPixmap );
@@ -197,7 +202,7 @@ WXPixmap wxBitmapCache::GetInsensPixmap( WXWidget w )
 
     m_insensPixmap =
         (WXPixmap)XCreateInsensitivePixmap( (Display*)m_display,
-                                            (Pixmap)m_bitmap.GetPixmap() );
+                                            (Pixmap)m_bitmap.GetDrawable() );
 
     m_recalcPixmaps.insens = !m_insensPixmap;
     return m_insensPixmap;