From 37747da8234c579ae79961cbf35c9c696b139564 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 23 Oct 2006 22:12:48 +0000
Subject: [PATCH] don't use static objects containing bitmaps, this almost
 certainly results in problems during the program shutdown under X11; instead
 clean it up in a module

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/dcbufcmn.cpp | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index f4f289ed08..d57648f99a 100644
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/module.h"
 #endif
 
 #include "wx/dcbuffer.h"
@@ -37,33 +38,34 @@
 // wxSharedDCBufferManager: helper class maintaining backing store bitmap
 // ----------------------------------------------------------------------------
 
-class wxSharedDCBufferManager
+class wxSharedDCBufferManager : public wxModule
 {
 public:
     wxSharedDCBufferManager() { }
-    ~wxSharedDCBufferManager() { }
 
-    wxBitmap GetBuffer(int w, int h)
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { wxDELETE(ms_buffer); }
+
+    static wxBitmap GetBuffer(int w, int h)
     {
-        if ( !m_buffer.IsOk() ||
-             w > m_buffer.GetWidth() ||
-             h > m_buffer.GetHeight() )
+        if ( !ms_buffer ||
+                w > ms_buffer->GetWidth() ||
+                    h > ms_buffer->GetHeight() )
         {
-            // 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 = wxBitmap(w, h);
+            delete ms_buffer;
+            ms_buffer = new wxBitmap(w, h);
         }
 
-        return m_buffer;
+        return *ms_buffer;
     }
 
 private:
-    wxBitmap m_buffer;
+    static wxBitmap *ms_buffer;
+
+    DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)
 };
 
-static wxSharedDCBufferManager gs_sharedDCBufferManager;
-
+IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
 
 // ============================================================================
 // wxBufferedDC
@@ -76,7 +78,7 @@ void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
         if ( w == -1 || h == -1 )
             m_dc->GetSize(&w, &h);
 
-        m_buffer = gs_sharedDCBufferManager.GetBuffer(w, h);
+        m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);
     }
 
     SelectObject(m_buffer);