simplifications and corrections to background drawing:

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 3c843eae1d342557848118e6f5ee998248d8e703..a3ac365287797b80972362e05d9bf963a554e360 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -7,10 +7,13 @@
 // 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
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/dcmemory.h"
 
 #include <gdk/gdk.h>
 #include "wx/dcmemory.h"
 
 #include <gdk/gdk.h>


@@ -68,6 +71,10 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_window = m_selected.GetBitmap();
         }
 
             m_window = m_selected.GetBitmap();
         }
 

+#ifdef __WXGTK20__
+        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
+#endif
+

         m_isMemDC = TRUE;
 
         SetUpDC();
         m_isMemDC = TRUE;
 
         SetUpDC();