Reverted patch 1476893 pending further investigation (broke Advise in IPC)

[wxWidgets.git] / src / richtext / richtextbuffer.cpp

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 891aae4042066968861be29c45c697d9b02b92ee..83b2e6f44933f46363b8381cf7d63cfd84e748e4 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -5953,8 +5953,8 @@ bool wxRichTextAction::Do()
                         
                         if (pt.y > lastY)
                         {
                         
                         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)
                         {                    
                         }
                         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
                         {
                         
                         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
                         {
                         }
                         else
                         {


@@ -6139,8 +6139,9 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
                                     foundEnd = true;
                                     lastY = pt.y - firstVisiblePt.y;
 
                                     foundEnd = true;
                                     lastY = pt.y - firstVisiblePt.y;
 

-                                    node2 = NULL;
-                                    node = NULL;
+                                    node2 = wxRichTextLineList::compatibility_iterator();
+                                    node = wxRichTextObjectList::compatibility_iterator();
+

                                     break;
                                 }                    
                             }
                                     break;
                                 }                    
                             }