up to 2.8.0

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

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index fe807524121e2f394b7c9276dca28012c5dd5b5a..ed6bb0e7bbf4b1296d657788feef9240b34915c0 100644 (file)
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -24,113 +24,64 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif
-

 #include "wx/dcbuffer.h"
 
 #include "wx/dcbuffer.h"
 

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

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

-// ============================================================================
-// wxSharedDCBufferManager
-//   Helper class to free shared buffer when the app exists.
-// ============================================================================
+// ----------------------------------------------------------------------------
+// wxSharedDCBufferManager: helper class maintaining backing store bitmap
+// ----------------------------------------------------------------------------

 
 

-class wxSharedDCBufferManager
+class wxSharedDCBufferManager : public wxModule

 {
 {

-    friend class wxBufferedDC;

 public:
 public:

+    wxSharedDCBufferManager() { }

 
 

-    wxSharedDCBufferManager()
-    {
-        m_buffer = NULL;
-    }
-
-    ~wxSharedDCBufferManager()
-    {
-        delete m_buffer;
-    }
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { wxDELETE(ms_buffer); }

 
 

-    wxBitmap* GetBuffer(wxWindow* win, const wxSize& area)
+    static wxBitmap* GetBuffer(int w, int h)

     {
     {

-        int width = area.x;
-        int height = area.y;
-
-        if ( width <= 0 )
-            win->GetClientSize(&width, &height);
-
-        if ( !m_buffer ||
-             width > m_buffer->GetWidth() ||
-             height > m_buffer->GetHeight() )
+        if ( !ms_buffer ||
+                w > ms_buffer->GetWidth() ||
+                    h > ms_buffer->GetHeight() )

         {
         {

-            delete m_buffer;
-
-            // Create slightly larger bitmap so we don't need to
-            // be reallocating constantly when the user enlarges
-            // the frame for the first time.
-            m_buffer = new wxBitmap(width+20, height+20);
+            delete ms_buffer;
+            ms_buffer = new wxBitmap(w, h);

         }
         }

-
-        return m_buffer;
+        return ms_buffer;

     }
 
 private:
     }
 
 private:

-    wxBitmap*   m_buffer;
+    static wxBitmap *ms_buffer;
+
+    DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)

 };
 
 };
 

-static wxSharedDCBufferManager gs_sharedDCBufferManager;
+wxBitmap* wxSharedDCBufferManager::ms_buffer = NULL;
+
+IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)

 
 // ============================================================================
 // wxBufferedDC
 // ============================================================================
 
 
 // ============================================================================
 // wxBufferedDC
 // ============================================================================
 

-// Blits the buffer to the dc, and detaches the dc from the buffer (so it
-// can be effectively used once only).
-//
-// Usually called in the dtor or by the dtor of derived classes if the
-// BufferedDC must blit before the derived class (which may own the dc it's
-// blitting to) is destroyed.
-void wxBufferedDC::UnMask()
+void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)

 {
 {

-    if ( m_buffer )
+    if ( !m_buffer || !m_buffer->IsOk() )

     {
     {

-        wxASSERT_MSG( m_mainDc != NULL,
-                      _T("No underlying DC associated with wxBufferedDC (anymore)") );
-
-        wxDC* bufferDc = DetachDC();
-
-        wxASSERT( bufferDc->IsKindOf(CLASSINFO(wxMemoryDC)) );
-
-        wxCoord x=0, y=0;
-
-        if (m_style & wxBUFFER_CLIENT_AREA)
-            bufferDc->GetDeviceOrigin(& x, & y);
+        if ( w == -1 || h == -1 )
+            m_dc->GetSize(&w, &h);

 
 

-        m_mainDc->Blit( 0, 0,
-                        m_buffer->GetWidth(), m_buffer->GetHeight(), bufferDc,
-                        -x, -y );
-        m_mainDc = NULL;
-        m_buffer = NULL;
-        delete bufferDc;
+        m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);

     }
     }

-}
-
-void wxBufferedDC::PrepareBuffer(wxWindow* win, const wxSize& area)
-{
-    m_buffer = gs_sharedDCBufferManager.GetBuffer(win, area);
-}

 
 

-void wxBufferedDC::UseBuffer()
-{
-    wxASSERT(m_buffer);
-
-    wxMemoryDC* memoryDc = new wxMemoryDC(m_mainDc);
-    memoryDc->SelectObject(*m_buffer);
-
-    AttachDC(memoryDc);
+    SelectObject(*m_buffer);

 }
 
 }
 

-