cleanup in toplevel activation, and switching to native carbon event notification...

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

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index c0b958ab78a851c435c820a3aeaf66a4bb055a42..2ceb292b7fd9e06f72d8d9ed5754657fb517f5ce 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -9,12 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "bmpmotif.h"
 #endif
 
 #ifdef __VMS
 #define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
 #endif
 
 #include "wx/defs.h"
@@ -99,7 +100,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 +198,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;