applying, closes #9012

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

diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp
index cc998a68f925875d0662e463376ea3be542367bf..57c315012a780c41ab7d583df772f49b2091d044 100644 (file)
--- a/src/osx/carbon/textctrl.cpp
+++ b/src/osx/carbon/textctrl.cpp
@@ -1125,6 +1125,15 @@ long wxMacMLTEControl::GetLastPosition() const
     wxTextPos actualsize = 0 ;
 
     Handle theText ;
     wxTextPos actualsize = 0 ;
 
     Handle theText ;

+#if wxUSE_UNICODE
+    OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNUnicodeTextData );
+    // all done
+    if ( err == noErr )
+    {
+        actualsize = GetHandleSize( theText )/sizeof(UniChar);
+        DisposeHandle( theText ) ;
+    }
+#else

     OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
 
     // all done
     OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
 
     // all done


@@ -1133,6 +1142,7 @@ long wxMacMLTEControl::GetLastPosition() const
         actualsize = GetHandleSize( theText ) ;
         DisposeHandle( theText ) ;
     }
         actualsize = GetHandleSize( theText ) ;
         DisposeHandle( theText ) ;
     }

+#endif

     else
     {
         actualsize = 0 ;
     else
     {
         actualsize = 0 ;