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

use wxBitmap object as m_buffer and not a pointer to it (replaces patch 1582878)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-23 22:06:01 +00:00
parent e3cec970d7
commit 1a9a3ce9a3
2 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/dcbufcmn.cpp
View File

@@ -29,25 +29,21 @@
#include "wx/dcbuffer.h"
// ============================================================================
// implementation
// ============================================================================
// ============================================================================
// wxSharedDCBufferManager
// Helper class to free shared buffer when the app exists.
// ============================================================================
// ----------------------------------------------------------------------------
// wxSharedDCBufferManager: helper class maintaining backing store bitmap
// ----------------------------------------------------------------------------
class wxSharedDCBufferManager
{
friend class wxBufferedDC;
public:
wxSharedDCBufferManager() { }
~wxSharedDCBufferManager() { }
wxBitmap* GetBuffer(int w, int h)
wxBitmap GetBuffer(int w, int h)
{
if ( !m_buffer.IsOk() ||
w > m_buffer.GetWidth() ||
@@ -59,11 +55,11 @@ public:
m_buffer = wxBitmap(w, h);
}
return &m_buffer;
return m_buffer;
}
private:
wxBitmap m_buffer;
wxBitmap m_buffer;
};
static wxSharedDCBufferManager gs_sharedDCBufferManager;
@@ -75,7 +71,7 @@ static wxSharedDCBufferManager gs_sharedDCBufferManager;
void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
{
if ( !m_buffer )
if ( !m_buffer.IsOk() )
{
if ( w == -1 || h == -1 )
m_dc->GetSize(&w, &h);
@@ -83,6 +79,6 @@ void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
m_buffer = gs_sharedDCBufferManager.GetBuffer(w, h);
}
SelectObject(*m_buffer);
SelectObject(m_buffer);
}