last commit resolved the conflict incorrectly, undoing it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -91,9 +91,6 @@ bool wxSharedDCBufferManager::ms_usingSharedBuffer = false;
|
|||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
|
IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC)
|
|
||||||
IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC)
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// wxBufferedDC
|
// wxBufferedDC
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|||||||
Reference in New Issue
Block a user