rebaked after addition of XRC handler for richtext control

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

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index d57648f99a5454d627ddfae94d1c3e5302fc30ad..ed6bb0e7bbf4b1296d657788feef9240b34915c0 100644 (file)
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -24,12 +24,12 @@
     #pragma hdrstop
 #endif
 
+#include "wx/dcbuffer.h"
+
 #ifndef WX_PRECOMP
     #include "wx/module.h"
 #endif
 
-#include "wx/dcbuffer.h"
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -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,6 +64,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)
 };
 
+wxBitmap* wxSharedDCBufferManager::ms_buffer = NULL;
+
 IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
 
 // ============================================================================
@@ -73,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);
@@ -81,6 +82,6 @@ void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
         m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);
     }
 
-    SelectObject(m_buffer);
+    SelectObject(*m_buffer);
 }