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

ugly fix for warnings when wxUSE_STL==0 not breaking compilation when wxUSE_STL==1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-13 22:53:49 +00:00
parent c7e22c6923
commit 28b4db7f89
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/dcbase.cpp
View File

@@ -290,7 +290,11 @@ void wxDCBase::DoDrawSpline( wxList *points )
wx_spline_add_point(x1, y1); wx_spline_add_point(x1, y1);
while ((node = node->GetNext())) while ((node = node->GetNext())
#if !wxUSE_STL
!= NULL
#endif // !wxUSE_STL
)
{ {
p = (wxPoint *)node->GetData(); p = (wxPoint *)node->GetData();
x1 = x2; x1 = x2;

7
src/html/htmlpars.cpp
View File

@@ -375,7 +375,12 @@ void wxHtmlParser::PopTagHandler()
wxList::compatibility_iterator first; wxList::compatibility_iterator first;
if ( !m_HandlersStack || if ( !m_HandlersStack ||
!(first = m_HandlersStack->GetFirst()) ) #if wxUSE_STL
!(first = m_HandlersStack->GetFirst())
#else // !wxUSE_STL
((first = m_HandlersStack->GetFirst()) == NULL)
#endif // wxUSE_STL/!wxUSE_STL
)
{ {
wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack.")); wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
return; return;