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

wxUSE_STL compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-10 21:14:14 +00:00
parent 65c0217e32
commit fc10daf37c
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/dc.cpp
View File

@@ -2139,7 +2139,7 @@ wxDCCacheEntry::~wxDCCacheEntry()
wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h) wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
{ {
int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
wxNode* node = sm_bitmapCache.GetFirst(); wxList::compatibility_iterator node = sm_bitmapCache.GetFirst();
while (node) while (node)
{ {
wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData(); wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();
@@ -2175,7 +2175,7 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc) wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
{ {
int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
wxNode* node = sm_dcCache.GetFirst(); wxList::compatibility_iterator node = sm_dcCache.GetFirst();
while (node) while (node)
{ {
wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData(); wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();
@@ -2213,12 +2213,8 @@ void wxDC::AddToDCCache(wxDCCacheEntry* entry)
void wxDC::ClearCache() void wxDC::ClearCache()
{ {
sm_dcCache.DeleteContents(TRUE); WX_CLEAR_LIST(wxList, sm_dcCache);
sm_dcCache.Clear(); WX_CLEAR_LIST(wxList, sm_bitmapCache);
sm_dcCache.DeleteContents(FALSE);
sm_bitmapCache.DeleteContents(TRUE);
sm_bitmapCache.Clear();
sm_bitmapCache.DeleteContents(FALSE);
} }
// Clean up cache at app exit // Clean up cache at app exit

6
src/msw/notebook.cpp
View File

@@ -668,9 +668,9 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
// OnSetFocus() because we don't know which direction the focus came // OnSetFocus() because we don't know which direction the focus came
// from in this case and so can't choose between setting the focus to // from in this case and so can't choose between setting the focus to
// first or last panel child // first or last panel child
wxWindow *parent = GetParent(); wxWindow *parent = GetParent();
if ( event.GetEventObject() == parent ) // the cast is here to fic a GCC ICE
if ( ((wxWindow*)event.GetEventObject()) == parent )
{ {
// no, it doesn't come from child, case (b): forward to a page // no, it doesn't come from child, case (b): forward to a page
if ( m_nSelection != -1 ) if ( m_nSelection != -1 )
@@ -822,7 +822,7 @@ void wxNotebook::ApplyThemeBackground(wxWindow* window, const wxColour& colour)
window->SetBackgroundColour(colour); window->SetBackgroundColour(colour);
} }
for ( wxWindowList::Node *node = window->GetChildren().GetFirst(); node; node = node->GetNext() ) for ( wxWindowList::compatibility_iterator node = window->GetChildren().GetFirst(); node; node = node->GetNext() )
{ {
wxWindow *child = node->GetData(); wxWindow *child = node->GetData();
ApplyThemeBackground(child, colour); ApplyThemeBackground(child, colour);