Typos

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 56a3a6812cf4c6c137412ecd99f51f3d3f6d8ccd..dd30e8ce1a66e54f20919e2c902c6c788b5d77a8 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -16,14 +16,14 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#if wxUSE_RICHTEXT
+
+#include "wx/richtext/richtextbuffer.h"
+

 #ifndef WX_PRECOMP
   #include "wx/wx.h"
 #endif
 
 #ifndef WX_PRECOMP
   #include "wx/wx.h"
 #endif
 

-#include "wx/image.h"
-
-#if wxUSE_RICHTEXT
-

 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/dataobj.h"
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/dataobj.h"


@@ -32,14 +32,13 @@
 #include "wx/mstream.h"
 #include "wx/sstream.h"
 
 #include "wx/mstream.h"
 #include "wx/sstream.h"
 

-#include "wx/richtext/richtextbuffer.h"

 #include "wx/richtext/richtextctrl.h"
 #include "wx/richtext/richtextstyles.h"
 
 #include "wx/listimpl.cpp"
 
 #include "wx/richtext/richtextctrl.h"
 #include "wx/richtext/richtextstyles.h"
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxRichTextObjectList);
-WX_DEFINE_LIST(wxRichTextLineList);
+WX_DEFINE_LIST(wxRichTextObjectList)
+WX_DEFINE_LIST(wxRichTextLineList)

 
 /*!
  * wxRichTextObject
 
 /*!
  * wxRichTextObject


@@ -568,7 +567,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 +656,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();


@@ -1131,8 +1130,6 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm
 
         return true;
     }
 
         return true;
     }

-
-    return false;

 }
 
 /// Make a copy of the fragment corresponding to the given range, putting it in 'fragment'.
 }
 
 /// Make a copy of the fragment corresponding to the given range, putting it in 'fragment'.


@@ -1592,8 +1589,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;
 


@@ -2229,7 +2226,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 +2637,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());
     }


@@ -3410,13 +3407,13 @@ 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;
     }
 

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

     wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();
     m_attributeStack.Erase(node);
 
     wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();
     m_attributeStack.Erase(node);
 


@@ -3437,7 +3434,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 +3961,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 +3972,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 +4110,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();


@@ -4871,8 +4868,8 @@ bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& f
     wxFFileInputStream stream(filename);
     if (stream.Ok())
         return LoadFile(buffer, stream);
     wxFFileInputStream stream(filename);
     if (stream.Ok())
         return LoadFile(buffer, stream);

-    else
-        return false;
+
+    return false;

 }
 
 bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
 }
 
 bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)


@@ -4880,8 +4877,8 @@ bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& f
     wxFFileOutputStream stream(filename);
     if (stream.Ok())
         return SaveFile(buffer, stream);
     wxFFileOutputStream stream(filename);
     if (stream.Ok())
         return SaveFile(buffer, stream);

-    else
-        return false;
+
+    return false;

 }
 #endif // wxUSE_STREAMS
 
 }
 #endif // wxUSE_STREAMS
 


@@ -4980,8 +4977,7 @@ void wxRichTextImageBlock::Init()
 
 void wxRichTextImageBlock::Clear()
 {
 
 void wxRichTextImageBlock::Clear()
 {

-    if (m_data)
-        delete m_data;
+    delete[] m_data;

     m_data = NULL;
     m_dataSize = 0;
     m_imageType = -1;
     m_data = NULL;
     m_dataSize = 0;
     m_imageType = -1;