Out typemap for wxString&

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

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index f6dad4310bb53e8d1e02953cbe5a93e261f40980..a4d736f1f67b3fbacf63d07f935ee04f86424cf7 100644 (file)
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -345,7 +345,7 @@ class wxFindDialogEvent : public wxCommandEvent
 public:
     wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     int GetFlags();
-    wxString GetFindString();
+    const wxString& GetFindString();
     const wxString& GetReplaceString();
     wxFindReplaceDialog *GetDialog();
     void SetFlags(int flags);

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 7b73b7a73ed744d8e890a392a41cb5092682a39e..8e5898332d52cfe94daef005f657039970b59444 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -61,6 +61,7 @@
 %#endif
 }
 
+
 %typemap(out) wxString* {
 %#if wxUSE_UNICODE
     $result = PyUnicode_FromWideChar($1->c_str(), $1->Len());
@@ -69,6 +70,16 @@
 %#endif
 }
 
+
+%typemap(out) wxString& {
+%#if wxUSE_UNICODE
+    $result = PyUnicode_FromWideChar($1->c_str(), $1->Len());
+%#else
+    $result = PyString_FromStringAndSize($1->c_str(), $1->Len());
+%#endif
+}
+
+
 %typemap(varout) wxString {
 %#if wxUSE_UNICODE
     $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());