bug fix. The wxCharBuffer was being destroyed before it was used.

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

diff --git a/contrib/src/stc/gen_iface.py b/contrib/src/stc/gen_iface.py
index 18b28cbdd395a640210125e7e0d0e3abff2cacdf..82de85895bbe337bc4af03e7a473400896653005 100644 (file)
--- a/contrib/src/stc/gen_iface.py
+++ b/contrib/src/stc/gen_iface.py
@@ -254,7 +254,8 @@ methodOverrideMap = {
                      TextToFind  ft;
                      ft.chrg.cpMin = minPos;
                      ft.chrg.cpMax = maxPos;
-                     ft.lpstrText = (char*)(const char*)wx2stc(text);
+                     wxWX2MBbuf buf = wx2stc(text);
+                     ft.lpstrText = (char*)(const char*)buf;
 
                      return SendMsg(%s, flags, (long)&ft);''',
                   0),

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index bda10615e501e2fd396dc8fc2bc84a7aa6fcb48a..7451dbd33424fe1af4734224b2958457a6b835a1 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -951,7 +951,8 @@ int wxStyledTextCtrl::FindText(int minPos, int maxPos,
                      TextToFind  ft;
                      ft.chrg.cpMin = minPos;
                      ft.chrg.cpMax = maxPos;
-                     ft.lpstrText = (char*)(const char*)wx2stc(text);
+                     wxWX2MBbuf buf = wx2stc(text);
+                     ft.lpstrText = (char*)(const char*)buf;
 
                      return SendMsg(2150, flags, (long)&ft);
 }

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index 18b28cbdd395a640210125e7e0d0e3abff2cacdf..82de85895bbe337bc4af03e7a473400896653005 100644 (file)
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -254,7 +254,8 @@ methodOverrideMap = {
                      TextToFind  ft;
                      ft.chrg.cpMin = minPos;
                      ft.chrg.cpMax = maxPos;
-                     ft.lpstrText = (char*)(const char*)wx2stc(text);
+                     wxWX2MBbuf buf = wx2stc(text);
+                     ft.lpstrText = (char*)(const char*)buf;
 
                      return SendMsg(%s, flags, (long)&ft);''',
                   0),

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index bda10615e501e2fd396dc8fc2bc84a7aa6fcb48a..7451dbd33424fe1af4734224b2958457a6b835a1 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -951,7 +951,8 @@ int wxStyledTextCtrl::FindText(int minPos, int maxPos,
                      TextToFind  ft;
                      ft.chrg.cpMin = minPos;
                      ft.chrg.cpMax = maxPos;
-                     ft.lpstrText = (char*)(const char*)wx2stc(text);
+                     wxWX2MBbuf buf = wx2stc(text);
+                     ft.lpstrText = (char*)(const char*)buf;
 
                      return SendMsg(2150, flags, (long)&ft);
 }