From fc10daf37cbfc1620543d8128ed265b374240501 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Thu, 10 Jul 2003 21:14:14 +0000 Subject: [PATCH] wxUSE_STL compilation fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/dc.cpp | 12 ++++-------- src/msw/notebook.cpp | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index a795a51b5e..e0a2166aea 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -2139,7 +2139,7 @@ wxDCCacheEntry::~wxDCCacheEntry() wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h) { int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); - wxNode* node = sm_bitmapCache.GetFirst(); + wxList::compatibility_iterator node = sm_bitmapCache.GetFirst(); while (node) { 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) { int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL); - wxNode* node = sm_dcCache.GetFirst(); + wxList::compatibility_iterator node = sm_dcCache.GetFirst(); while (node) { wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData(); @@ -2213,12 +2213,8 @@ void wxDC::AddToDCCache(wxDCCacheEntry* entry) void wxDC::ClearCache() { - sm_dcCache.DeleteContents(TRUE); - sm_dcCache.Clear(); - sm_dcCache.DeleteContents(FALSE); - sm_bitmapCache.DeleteContents(TRUE); - sm_bitmapCache.Clear(); - sm_bitmapCache.DeleteContents(FALSE); + WX_CLEAR_LIST(wxList, sm_dcCache); + WX_CLEAR_LIST(wxList, sm_bitmapCache); } // Clean up cache at app exit diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index f2b88f379e..c09e5fc085 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -668,9 +668,9 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // 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 // first or last panel child - 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 if ( m_nSelection != -1 ) @@ -822,7 +822,7 @@ void wxNotebook::ApplyThemeBackground(wxWindow* window, const wxColour& 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(); ApplyThemeBackground(child, colour); -- 2.47.2