send wxEVT_MENU_CLOSE at least sometimes

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 82ae7f3c0d32651445aa8f8d43fc7214a3a0b89a..81dbf40eed5036541fb176ac61c8c9586b85fd34 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


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


@@ -3410,7 +3409,7 @@ 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;


@@ -4113,9 +4112,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 +4870,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 +4879,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 +4979,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;