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

Removed cacheing option

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-07-11 17:27:23 +00:00
parent 6c02c32922
commit 2774804745
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/dc.h
View File

@@ -491,7 +491,7 @@ public:
// Put ClearCache in the wxDC implementation class, since it has to be // Put ClearCache in the wxDC implementation class, since it has to be
// static. // static.
// static void ClearCache() ; // static void ClearCache() ;
#if wxUSE_DC_CACHEING #if 0 // wxUSE_DC_CACHEING
static void EnableCache(bool cacheing) { sm_cacheing = cacheing; } static void EnableCache(bool cacheing) { sm_cacheing = cacheing; }
static bool CacheEnabled() { return sm_cacheing ; } static bool CacheEnabled() { return sm_cacheing ; }
#endif #endif
@@ -699,7 +699,7 @@ protected:
bool m_isInteractive:1; bool m_isInteractive:1;
bool m_isBBoxValid:1; bool m_isBBoxValid:1;
#if wxUSE_DC_CACHEING #if wxUSE_DC_CACHEING
static bool sm_cacheing; // static bool sm_cacheing;
#endif #endif
// coordinate system variables // coordinate system variables

2
src/common/dcbase.cpp
View File

@@ -32,7 +32,7 @@
#include <math.h> #include <math.h>
bool wxDCBase::sm_cacheing = FALSE; // bool wxDCBase::sm_cacheing = FALSE;
// ============================================================================ // ============================================================================
// implementation // implementation

7
src/msw/dc.cpp
View File

@@ -1704,7 +1704,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
HBITMAP buffer_bmap ; HBITMAP buffer_bmap ;
#if wxUSE_DC_CACHEING #if wxUSE_DC_CACHEING
if (CacheEnabled()) if (TRUE)
{ {
// create a temp buffer bitmap and DCs to access it and the mask // create a temp buffer bitmap and DCs to access it and the mask
wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC()); wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC());
@@ -1776,14 +1776,13 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
::SelectObject(dc_mask, 0); ::SelectObject(dc_mask, 0);
::SelectObject(dc_buffer, 0); ::SelectObject(dc_buffer, 0);
#if wxUSE_DC_CACHEING #if !wxUSE_DC_CACHEING
if (!CacheEnabled())
#endif
{ {
::DeleteDC(dc_mask); ::DeleteDC(dc_mask);
::DeleteDC(dc_buffer); ::DeleteDC(dc_buffer);
::DeleteObject(buffer_bmap); ::DeleteObject(buffer_bmap);
} }
#endif
} }
} }
else // no mask, just BitBlt() it else // no mask, just BitBlt() it