adaption for CW 8.3 and quick hack for unicode text control size

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index f260ca06fce48d25e94449595d13f27d4f49de42..f05af51e4536dcd913e287475944c033da7b99d1 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1413,7 +1413,9 @@ void wxTextCtrl::WriteText(const wxString& str)
 {
     if ( !wxIsMainThread() )
     {
-        wxMacMPRemoteGUICall( this , &wxTextCtrl::WriteText , str ) ;
+        // unfortunately CW 8 is not able to correctly deduce the template types, so we have 
+        // to instantiate explicitely
+        wxMacMPRemoteGUICall<wxTextCtrl,wxString>( this , &wxTextCtrl::WriteText , str ) ;
         return ;
     }
     else
@@ -1516,6 +1518,13 @@ wxSize wxTextCtrl::DoGetBestSize() const
             break ; 
     }
 
+#if !wxMAC_USE_MLTE
+    // unicode text control is using client size, ie 3 pixels on every side
+    // TODO make this fit into normal window size concept, probably having 
+    // to reintroduce the margin vars
+    hText -= 6 ;
+#endif
+
     if ( m_windowStyle & wxTE_MULTILINE )
     {
          hText *= 5 ;