Small fixes to allow compilation with --enable-stl

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 3e4e08a5bff640dc27da1060ba12592ec94c7786..e3b2ab5d58599ab0bff4c0e6c84e715574cd4b80 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -1591,8 +1591,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                     wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
                     wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);
 
                     wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
                     wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);
 

-                    wxASSERT(firstNode != NULL);
-                    wxASSERT(lastNode != NULL);
+                    wxASSERT(firstNode);
+                    wxASSERT(lastNode);

 
                     wxRichTextObjectList::compatibility_iterator node2 = firstNode;
 
 
                     wxRichTextObjectList::compatibility_iterator node2 = firstNode;
 


@@ -3409,7 +3409,7 @@ bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style)
 /// End the style
 bool wxRichTextBuffer::EndStyle()
 {
 /// End the style
 bool wxRichTextBuffer::EndStyle()
 {

-    if (m_attributeStack.GetFirst() == NULL)
+    if (m_attributeStack.GetFirst())

     {
         wxLogDebug(_("Too many EndStyle calls!"));
         return false;
     {
         wxLogDebug(_("Too many EndStyle calls!"));
         return false;