use real alpha blending algorithm to avoid sickly looking colors on some platforms

[wxWidgets.git] / src / common / dcbufcmn.cpp

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index 686daadc773ae35c9150d76005232792a8ab5b4d..ed6bb0e7bbf4b1296d657788feef9240b34915c0 100644 (file)
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -46,7 +46,7 @@ public:
     virtual bool OnInit() { return true; }
     virtual void OnExit() { wxDELETE(ms_buffer); }
 
-    static wxBitmap GetBuffer(int w, int h)
+    static wxBitmap* GetBuffer(int w, int h)
     {
         if ( !ms_buffer ||
                 w > ms_buffer->GetWidth() ||
@@ -55,8 +55,7 @@ public:
             delete ms_buffer;
             ms_buffer = new wxBitmap(w, h);
         }
-
-        return *ms_buffer;
+        return ms_buffer;
     }
 
 private:
@@ -65,7 +64,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)
 };
 
-wxBitmap* wxSharedDCBufferManager::ms_buffer;
+wxBitmap* wxSharedDCBufferManager::ms_buffer = NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
 
@@ -75,7 +74,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
 
 void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
 {
-    if ( !m_buffer.IsOk() )
+    if ( !m_buffer || !m_buffer->IsOk() )
     {
         if ( w == -1 || h == -1 )
             m_dc->GetSize(&w, &h);
@@ -83,6 +82,6 @@ void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
         m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);
     }
 
-    SelectObject(m_buffer);
+    SelectObject(*m_buffer);
 }