made wxNumberEntryDialog public; extracted it and wxGetNumberFromUser() in a separate...

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

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index 34cc5f075387fb6c1c479593b569b7dbec16a64a..65affeed87a40ad7bcd75c6e8266073025942283 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/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
 


@@ -59,7 +59,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         }
         else
         {
         }
         else
         {

-//            m_window = m_selected.GetBitmap();
+            m_window = m_selected.GetBitmap();

         }
 
         m_isMemDC = TRUE;
         }
 
         m_isMemDC = TRUE;