mac cleanup, pure cgcolor

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

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index d57648f99a5454d627ddfae94d1c3e5302fc30ad..b38b4f1f67921c65093f3bcbc69c3517a42b30e8 100644 (file)
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -24,12 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dcbuffer.h"
+

 #ifndef WX_PRECOMP
     #include "wx/module.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/module.h"
 #endif
 

-#include "wx/dcbuffer.h"
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -46,8 +46,11 @@ public:
     virtual bool OnInit() { return true; }
     virtual void OnExit() { wxDELETE(ms_buffer); }
 
     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_usingSharedBuffer )
+            return new wxBitmap(w, h);
+

         if ( !ms_buffer ||
                 w > ms_buffer->GetWidth() ||
                     h > ms_buffer->GetHeight() )
         if ( !ms_buffer ||
                 w > ms_buffer->GetWidth() ||
                     h > ms_buffer->GetHeight() )


@@ -56,15 +59,33 @@ public:
             ms_buffer = new wxBitmap(w, h);
         }
 
             ms_buffer = new wxBitmap(w, h);
         }
 

-        return *ms_buffer;
+        ms_usingSharedBuffer = true;
+        return ms_buffer;
+    }
+
+    static void ReleaseBuffer(wxBitmap* buffer)
+    {
+        if ( buffer == ms_buffer )
+        {
+            wxASSERT_MSG( ms_usingSharedBuffer, wxT("shared buffer already released") );
+            ms_usingSharedBuffer = false;
+        }
+        else
+        {
+            delete buffer;
+        }

     }
 
 private:
     static wxBitmap *ms_buffer;
     }
 
 private:
     static wxBitmap *ms_buffer;

+    static bool ms_usingSharedBuffer;

 
     DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)
 };
 

+wxBitmap* wxSharedDCBufferManager::ms_buffer = NULL;
+bool wxSharedDCBufferManager::ms_usingSharedBuffer = false;
+

 IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
 
 // ============================================================================
 IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
 
 // ============================================================================


@@ -73,14 +94,33 @@ IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
 
 void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
 {
 
 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);
 
         m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);
     {
         if ( w == -1 || h == -1 )
             m_dc->GetSize(&w, &h);
 
         m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);

+        m_style |= wxBUFFER_USES_SHARED_BUFFER;

     }
 
     }
 

-    SelectObject(m_buffer);
+    SelectObject(*m_buffer);

 }
 
 }
 

+void wxBufferedDC::UnMask()
+{
+    wxCHECK_RET( m_dc, _T("no underlying wxDC?") );
+    wxASSERT_MSG( m_buffer && m_buffer->IsOk(), _T("invalid backing store") );
+
+    wxCoord x = 0,
+            y = 0;
+
+    if ( m_style & wxBUFFER_CLIENT_AREA )
+        GetDeviceOrigin(&x, &y);
+
+    m_dc->Blit(0, 0, m_buffer->GetWidth(), m_buffer->GetHeight(),
+               this, -x, -y );
+    m_dc = NULL;
+
+    if ( m_style & wxBUFFER_USES_SHARED_BUFFER )
+        wxSharedDCBufferManager::ReleaseBuffer(m_buffer);
+}