Don't insert a newline when we get text

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index eb61c8305007e97197a6136ade8ef35a5b56592c..b03ac28b9995a734d55d179394352768a6961247 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -1429,8 +1429,6 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra
         wxRichTextObject* child = node->GetData();
         if (!child->GetRange().IsOutside(range))
         {
         wxRichTextObject* child = node->GetData();
         if (!child->GetRange().IsOutside(range))
         {

-//            if (lineCount > 0)
-//                text += wxT("\n");

             wxRichTextRange childRange = range;
             childRange.LimitTo(child->GetRange());
 
             wxRichTextRange childRange = range;
             childRange.LimitTo(child->GetRange());
 


@@ -1438,7 +1436,7 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra
 
             text += childText;
 
 
             text += childText;
 

-            if (childRange.GetEnd() == child->GetRange().GetEnd())
+            if ((childRange.GetEnd() == child->GetRange().GetEnd()) && node->GetNext())

                 text += wxT("\n");
 
             lineCount ++;
                 text += wxT("\n");
 
             lineCount ++;

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 37a98dcd6a713165dff5487817ee982662c20ea8..71b83928427f8d2ec7e4a37c93dafb1853e5193f 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -409,7 +409,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
                         if (!urlTarget.IsEmpty())
                         {
                             wxMouseEvent mouseEvent(event);
                         if (!urlTarget.IsEmpty())
                         {
                             wxMouseEvent mouseEvent(event);

-                            
+

                             long startPos = 0, endPos = 0;
                             wxRichTextObject* obj = GetBuffer().GetLeafObjectAtPosition(position);
                             if (obj)
                             long startPos = 0, endPos = 0;
                             wxRichTextObject* obj = GetBuffer().GetLeafObjectAtPosition(position);
                             if (obj)


@@ -417,12 +417,12 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
                                 startPos = obj->GetRange().GetStart();
                                 endPos = obj->GetRange().GetEnd();
                             }
                                 startPos = obj->GetRange().GetStart();
                                 endPos = obj->GetRange().GetEnd();
                             }

-                            
+

                             wxTextUrlEvent urlEvent(GetId(), mouseEvent, startPos, endPos);
                             InitCommandEvent(urlEvent);
                             wxTextUrlEvent urlEvent(GetId(), mouseEvent, startPos, endPos);
                             InitCommandEvent(urlEvent);

-                            
+

                             urlEvent.SetString(urlTarget);
                             urlEvent.SetString(urlTarget);

-                            
+

                             GetEventHandler()->ProcessEvent(urlEvent);
                         }
                     }
                             GetEventHandler()->ProcessEvent(urlEvent);
                         }
                     }


@@ -513,7 +513,7 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& WXUNUSED(event))
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);

-    
+

     GetEventHandler()->ProcessEvent(cmdEvent);
 }
 
     GetEventHandler()->ProcessEvent(cmdEvent);
 }
 


@@ -525,7 +525,7 @@ void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& WXUNUSED(event))
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);

-    
+

     if (!GetEventHandler()->ProcessEvent(cmdEvent))
     {
         SelectWord(GetCaretPosition()+1);
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
     {
         SelectWord(GetCaretPosition()+1);


@@ -540,7 +540,7 @@ void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event)
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);

-    
+

     if (!GetEventHandler()->ProcessEvent(cmdEvent))
         event.Skip();
 }
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
         event.Skip();
 }


@@ -2064,30 +2064,21 @@ void wxRichTextCtrl::DoSetValue(const wxString& value, int flags)
 {
     Clear();
 
 {
     Clear();
 

-    // if the text is long enough, it's faster to just set it instead of first
-    // comparing it with the old one (chances are that it will be different
-    // anyhow, this comparison is there to avoid flicker for small single-line
-    // edit controls mostly)
-    if ( (value.length() > 0x400) || (value != GetValue()) )
+    if (!value.IsEmpty())

     {
     {

+        // Remove empty paragraph
+        GetBuffer().Clear();

         DoWriteText(value);
 
         // for compatibility, don't move the cursor when doing SetValue()
         SetInsertionPoint(0);
     }
         DoWriteText(value);
 
         // for compatibility, don't move the cursor when doing SetValue()
         SetInsertionPoint(0);
     }

-    else // same text
+    else

     {
     {

-        if ( flags & SetValue_SendEvent )
-        {
-            // still send an event for consistency
+        // still send an event for consistency
+        if (flags & SetValue_SendEvent)

             SendTextUpdatedEvent();
             SendTextUpdatedEvent();

-        }

     }
     }

-
-    // we should reset the modified flag even if the value didn't really change
-
-    // mark the control as being not dirty - we changed its text, not the
-    // user

     DiscardEdits();
 }
 
     DiscardEdits();
 }