cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-10-23 22:12:48 +00:00
parent 37ad32a422
commit 37747da823
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/dcbufcmn.cpp
View File

@ -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);