* Do not use class posing to handle target/action.

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

diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index a4afbacd2b0607b5e547f5ca8ea0d2f173dea4bd..b782d5ed47f649aaf4ce06118e97f8be6f0eb2ea 100644 (file)
--- a/src/mgl/dcmemory.cpp
+++ b/src/mgl/dcmemory.cpp
@@ -8,7 +8,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
 


@@ -44,11 +44,11 @@ wxMemoryDC::~wxMemoryDC()
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 {
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 {

-    SetMGLDC(NULL, TRUE);
-    m_selected = bitmap;
-

     if ( bitmap.Ok() )
     if ( bitmap.Ok() )

+    {
+        m_selected = bitmap;

         SetMGLDC(m_selected.CreateTmpDC(), TRUE);
         SetMGLDC(m_selected.CreateTmpDC(), TRUE);

+    }

 }
 
 void wxMemoryDC::SetPen(const wxPen &pen)
 }
 
 void wxMemoryDC::SetPen(const wxPen &pen)