byte length for interim UniChar String corrected

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 8ac24c411ea59731dbaed1bc7bb1a79f4e53f49b..3dd666c7009fac56f413bbd7c51321e9b10550cb 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dcmemory.h"
 #endif
 
 #pragma implementation "dcmemory.h"
 #endif
 


@@ -105,7 +105,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     
     if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display))
     {
     
     if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display))
     {

-        m_pixmap = m_bitmap.GetPixmap();
+        m_pixmap = m_bitmap.GetDrawable();

         Display* display = (Display*) m_display;
         
         XGCValues gcvalues;
         Display* display = (Display*) m_display;
         
         XGCValues gcvalues;