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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 8534732e7ba1577775e4a9e70b8b59365cea589c..77b09b154b28cfb0e66945eb55ab6017eda5195b 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -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();
         x1 = x2;
     {
         p = (wxPoint *)node->GetData();
         x1 = x2;

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index bb209217f71ae51ca057a615034ebbd0f89d1c64..3a409efb3bd1fef50d9fd751f3c6487c5fd510ae 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -375,7 +375,12 @@ void wxHtmlParser::PopTagHandler()
     wxList::compatibility_iterator first;
 
     if ( !m_HandlersStack ||
     wxList::compatibility_iterator first;
 
     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."));
         return;
     {
         wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
         return;