added alpha channel support to wxGTK2's wxBitmap

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 0ec10532b7d8ce554a856cda72862eee8115ed91..a3ac365287797b80972362e05d9bf963a554e360 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -71,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();

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 0ec10532b7d8ce554a856cda72862eee8115ed91..a3ac365287797b80972362e05d9bf963a554e360 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -71,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();