Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-04-30 12:30:20 +00:00
parent e31a990025
commit cfeff6f71c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mac/carbon/textctrl.cpp
View File

@@ -1413,7 +1413,9 @@ void wxTextCtrl::WriteText(const wxString& str)
{ {
if ( !wxIsMainThread() ) 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 ; return ;
} }
else else
@@ -1516,6 +1518,13 @@ wxSize wxTextCtrl::DoGetBestSize() const
break ; 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 ) if ( m_windowStyle & wxTE_MULTILINE )
{ {
hText *= 5 ; hText *= 5 ;