X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f7b34a878bbcb2f71a0c7694e2a3bec51460218..42c37decc53971441199dfe4d8adf7fb842b2336:/src/mgl/dcmemory.cpp

diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index a4afbacd2b..b782d5ed47 100644
--- a/src/mgl/dcmemory.cpp
+++ b/src/mgl/dcmemory.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcmemory.h"
 #endif
 
@@ -44,11 +44,11 @@ wxMemoryDC::~wxMemoryDC()
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 {
-    SetMGLDC(NULL, TRUE);
-    m_selected = bitmap;
-
     if ( bitmap.Ok() )
+    {
+        m_selected = bitmap;
         SetMGLDC(m_selected.CreateTmpDC(), TRUE);
+    }
 }
 
 void wxMemoryDC::SetPen(const wxPen &pen)