Applied patch from Armel Asselin that reduces memory required when

pasting text and when sending events.

Comment out some unneeded asserts.

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 2d793a91570daeaea004b711dfe922cf58d2e96b..a27fe5126b5596560b89fa1f094997f5dc41e690 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -484,7 +484,10 @@ void ScintillaWX::Paste() {
     if (gotData) {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));
     if (gotData) {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));

+  data.SetText(wxEmptyString); // free the data object content

         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

+  text = wxEmptyString; // free text
+

         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);

diff --git a/contrib/src/stc/scintilla/src/Editor.cxx b/contrib/src/stc/scintilla/src/Editor.cxx
index 0aa2a651c63278332608969654a6653dddf64fbf..2c0615e15012422d02230c6dec9086659179e236 100644 (file)
--- a/contrib/src/stc/scintilla/src/Editor.cxx
+++ b/contrib/src/stc/scintilla/src/Editor.cxx
@@ -213,7 +213,7 @@ void LineLayoutCache::Allocate(int length_) {
 }
 
 void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {
 }
 
 void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {

-       PLATFORM_ASSERT(useCount == 0);
+//     PLATFORM_ASSERT(useCount == 0);

        int lengthForLevel = 0;
        if (level == llcCaret) {
                lengthForLevel = 1;
        int lengthForLevel = 0;
        if (level == llcCaret) {
                lengthForLevel = 1;


@@ -239,7 +239,7 @@ void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {
 }
 
 void LineLayoutCache::Deallocate() {
 }
 
 void LineLayoutCache::Deallocate() {

-       PLATFORM_ASSERT(useCount == 0);
+//     PLATFORM_ASSERT(useCount == 0);

        for (int i = 0; i < length; i++)
                delete cache[i];
        delete []cache;
        for (int i = 0; i < length; i++)
                delete cache[i];
        delete []cache;

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index f2b2b1b8c14dae39a95c47a56c08424b9b6627d0..f42348d4bf47972a51ef777770942176e5eb4295 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -3186,12 +3186,7 @@ static void SetEventText(wxStyledTextEvent& evt, const char* text,
                          size_t length) {
     if(!text) return;
 
                          size_t length) {
     if(!text) return;
 

-    // The unicode conversion MUST have a null byte to terminate the
-    // string so move it into a buffer first and give it one.
-    wxMemoryBuffer buf(length+1);
-    buf.AppendData((void*)text, length);
-    buf.AppendByte(0);
-    evt.SetText(stc2wx(buf));
+    evt.SetText(stc2wx(text, length));

 }
 
 
 }
 
 

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index b99563feded2b5962193e8d9c7be766baeb3cfb9..2a9806a68a2adf03772aea3010017a41e22ce928 100644 (file)
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -854,12 +854,7 @@ static void SetEventText(wxStyledTextEvent& evt, const char* text,
                          size_t length) {
     if(!text) return;
 
                          size_t length) {
     if(!text) return;
 

-    // The unicode conversion MUST have a null byte to terminate the
-    // string so move it into a buffer first and give it one.
-    wxMemoryBuffer buf(length+1);
-    buf.AppendData((void*)text, length);
-    buf.AppendByte(0);
-    evt.SetText(stc2wx(buf));
+    evt.SetText(stc2wx(text, length));

 }
 
 
 }
 
 

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 2d793a91570daeaea004b711dfe922cf58d2e96b..a27fe5126b5596560b89fa1f094997f5dc41e690 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -484,7 +484,10 @@ void ScintillaWX::Paste() {
     if (gotData) {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));
     if (gotData) {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));

+  data.SetText(wxEmptyString); // free the data object content

         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);

+  text = wxEmptyString; // free text
+

         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);

diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
index 0aa2a651c63278332608969654a6653dddf64fbf..2c0615e15012422d02230c6dec9086659179e236 100644 (file)
--- a/src/stc/scintilla/src/Editor.cxx
+++ b/src/stc/scintilla/src/Editor.cxx
@@ -213,7 +213,7 @@ void LineLayoutCache::Allocate(int length_) {
 }
 
 void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {
 }
 
 void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {

-       PLATFORM_ASSERT(useCount == 0);
+//     PLATFORM_ASSERT(useCount == 0);

        int lengthForLevel = 0;
        if (level == llcCaret) {
                lengthForLevel = 1;
        int lengthForLevel = 0;
        if (level == llcCaret) {
                lengthForLevel = 1;


@@ -239,7 +239,7 @@ void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {
 }
 
 void LineLayoutCache::Deallocate() {
 }
 
 void LineLayoutCache::Deallocate() {

-       PLATFORM_ASSERT(useCount == 0);
+//     PLATFORM_ASSERT(useCount == 0);

        for (int i = 0; i < length; i++)
                delete cache[i];
        delete []cache;
        for (int i = 0; i < length; i++)
                delete cache[i];
        delete []cache;

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index f2b2b1b8c14dae39a95c47a56c08424b9b6627d0..f42348d4bf47972a51ef777770942176e5eb4295 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -3186,12 +3186,7 @@ static void SetEventText(wxStyledTextEvent& evt, const char* text,
                          size_t length) {
     if(!text) return;
 
                          size_t length) {
     if(!text) return;
 

-    // The unicode conversion MUST have a null byte to terminate the
-    // string so move it into a buffer first and give it one.
-    wxMemoryBuffer buf(length+1);
-    buf.AppendData((void*)text, length);
-    buf.AppendByte(0);
-    evt.SetText(stc2wx(buf));
+    evt.SetText(stc2wx(text, length));

 }
 
 
 }
 
 

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index b99563feded2b5962193e8d9c7be766baeb3cfb9..2a9806a68a2adf03772aea3010017a41e22ce928 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -854,12 +854,7 @@ static void SetEventText(wxStyledTextEvent& evt, const char* text,
                          size_t length) {
     if(!text) return;
 
                          size_t length) {
     if(!text) return;
 

-    // The unicode conversion MUST have a null byte to terminate the
-    // string so move it into a buffer first and give it one.
-    wxMemoryBuffer buf(length+1);
-    buf.AppendData((void*)text, length);
-    buf.AppendByte(0);
-    evt.SetText(stc2wx(buf));
+    evt.SetText(stc2wx(text, length));

 }
 
 
 }