From 27b5dab348a3ccd0d254fd035a6b8958787fe0d2 Mon Sep 17 00:00:00 2001 From: Julian Smart <julian@anthemion.co.uk> Date: Wed, 1 Nov 2006 09:45:06 +0000 Subject: [PATCH] Fixed compile error with --enable-stl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 891aae4042..83b2e6f449 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -5953,8 +5953,8 @@ bool wxRichTextAction::Do() if (pt.y > lastY) { - node2 = NULL; - node = NULL; + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); } else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y) { @@ -6118,8 +6118,8 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent if (pt.y > lastY) // going past the end of the window, no more info { - node2 = NULL; - node = NULL; + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); } else { @@ -6139,8 +6139,9 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent foundEnd = true; lastY = pt.y - firstVisiblePt.y; - node2 = NULL; - node = NULL; + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + break; } } -- 2.47.2