remove GetImageList(int)

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 619ae82058a525ac42011c64ed6f5f715d067c1b..3fb3820859fff842daf81aabb0a0a78f33bbc47b 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -370,7 +370,7 @@ bool wxRichTextCompositeObject::Defragment()
             if (child->CanMerge(nextChild) && child->Merge(nextChild))
             {
                 nextChild->Dereference();
             if (child->CanMerge(nextChild) && child->Merge(nextChild))
             {
                 nextChild->Dereference();

-                delete node->GetNext();
+                m_children.Erase(node->GetNext());

 
                 // Don't set node -- we'll see if we can merge again with the next
                 // child.
 
                 // Don't set node -- we'll see if we can merge again with the next
                 // child.


@@ -568,7 +568,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
         if (firstParagraph)
         {
             wxRichTextObjectList::compatibility_iterator firstNode = m_children.Find(firstParagraph);
         if (firstParagraph)
         {
             wxRichTextObjectList::compatibility_iterator firstNode = m_children.Find(firstParagraph);

-            wxRichTextObjectList::compatibility_iterator previousNode = firstNode ? firstNode->GetPrevious() : (wxRichTextObjectList::compatibility_iterator) NULL;
+            wxRichTextObjectList::compatibility_iterator previousNode = firstNode ? firstNode->GetPrevious() : wxRichTextObjectList::compatibility_iterator();

             if (firstNode && previousNode)
             {
                 wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
             if (firstNode && previousNode)
             {
                 wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);


@@ -657,8 +657,8 @@ bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wx
 {
     wxSize sz;
 
 {
     wxSize sz;
 

-    wxRichTextObjectList::compatibility_iterator startPara = NULL;
-    wxRichTextObjectList::compatibility_iterator endPara = NULL;
+    wxRichTextObjectList::compatibility_iterator startPara = wxRichTextObjectList::compatibility_iterator();
+    wxRichTextObjectList::compatibility_iterator endPara = wxRichTextObjectList::compatibility_iterator();

 
     // First find the first paragraph whose starting position is within the range.
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 
     // First find the first paragraph whose starting position is within the range.
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();


@@ -1352,7 +1352,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
                             }
 
                             wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
                             }
 
                             wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();

-                            delete node1;
+                            nextParagraph->GetChildren().Erase(node1);

 
                             node1 = next1;
                         }
 
                             node1 = next1;
                         }


@@ -2229,7 +2229,7 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect)
 bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
 {
     wxRichTextObject* childToUse = NULL;
 bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
 {
     wxRichTextObject* childToUse = NULL;

-    wxRichTextObjectList::compatibility_iterator nodeToUse = NULL;
+    wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator();

 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -2640,7 +2640,7 @@ void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list)
 /// Add content back from list
 void wxRichTextParagraph::MoveFromList(wxList& list)
 {
 /// Add content back from list
 void wxRichTextParagraph::MoveFromList(wxList& list)
 {

-    for (wxNode* node = list.GetFirst(); node; node = node->GetNext())
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

     {
         AppendChild((wxRichTextObject*) node->GetData());
     }
     {
         AppendChild((wxRichTextObject*) node->GetData());
     }


@@ -3416,9 +3416,9 @@ bool wxRichTextBuffer::EndStyle()
         return false;
     }
 
         return false;
     }
 

-    wxNode* node = m_attributeStack.GetLast();
+    wxList::compatibility_iterator node = m_attributeStack.GetLast();

     wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();
     wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();

-    delete node;
+    m_attributeStack.Erase(node);

 
     SetDefaultStyle(*attr);
 
 
     SetDefaultStyle(*attr);
 


@@ -3437,7 +3437,7 @@ bool wxRichTextBuffer::EndAllStyles()
 /// Clear the style stack
 void wxRichTextBuffer::ClearStyleStack()
 {
 /// Clear the style stack
 void wxRichTextBuffer::ClearStyleStack()
 {

-    for (wxNode* node = m_attributeStack.GetFirst(); node; node = node->GetNext())
+    for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext())

         delete (wxTextAttrEx*) node->GetData();
     m_attributeStack.Clear();
 }
         delete (wxTextAttrEx*) node->GetData();
     m_attributeStack.Clear();
 }


@@ -3964,7 +3964,7 @@ void wxRichTextCommand::AddAction(wxRichTextAction* action)
 
 bool wxRichTextCommand::Do()
 {
 
 bool wxRichTextCommand::Do()
 {

-    for (wxNode* node = m_actions.GetFirst(); node; node = node->GetNext())
+    for (wxList::compatibility_iterator node = m_actions.GetFirst(); node; node = node->GetNext())

     {
         wxRichTextAction* action = (wxRichTextAction*) node->GetData();
         action->Do();
     {
         wxRichTextAction* action = (wxRichTextAction*) node->GetData();
         action->Do();


@@ -3975,7 +3975,7 @@ bool wxRichTextCommand::Do()
 
 bool wxRichTextCommand::Undo()
 {
 
 bool wxRichTextCommand::Undo()
 {

-    for (wxNode* node = m_actions.GetLast(); node; node = node->GetPrevious())
+    for (wxList::compatibility_iterator node = m_actions.GetLast(); node; node = node->GetPrevious())

     {
         wxRichTextAction* action = (wxRichTextAction*) node->GetData();
         action->Undo();
     {
         wxRichTextAction* action = (wxRichTextAction*) node->GetData();
         action->Undo();


@@ -4113,9 +4113,9 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
         m_ctrl->SetCaretPosition(caretPosition);
         if (!m_ctrl->IsFrozen())
         {
         m_ctrl->SetCaretPosition(caretPosition);
         if (!m_ctrl->IsFrozen())
         {

-            m_ctrl->Layout();
+            m_ctrl->LayoutContent();

             m_ctrl->PositionCaret();
             m_ctrl->PositionCaret();

-            m_ctrl->Refresh();
+            m_ctrl->Refresh(false);

 
             if (sendUpdateEvent)
                 m_ctrl->SendUpdateEvent();
 
             if (sendUpdateEvent)
                 m_ctrl->SendUpdateEvent();