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

Small fixes to allow compilation with --enable-stl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-11-27 02:03:40 +00:00
parent b271d60d6a
commit 4c9847e14e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/richtext/richtextbuffer.cpp
View File

@@ -1591,8 +1591,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject); wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject); wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);
wxASSERT(firstNode != NULL); wxASSERT(firstNode);
wxASSERT(lastNode != NULL); 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 /// End the style
bool wxRichTextBuffer::EndStyle() bool wxRichTextBuffer::EndStyle()
{ {
if (m_attributeStack.GetFirst() == NULL) if (m_attributeStack.GetFirst())
{ {
wxLogDebug(_("Too many EndStyle calls!")); wxLogDebug(_("Too many EndStyle calls!"));
return false; return false;