Allow OS X Cocoa (or any OS X port) to override GetBestSize and provide a native OS X Cocoa impl. Also, fix the line ending check under OS X Cocoa, and a sanity check for SetStyle.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-11-26 23:11:27 +00:00
parent b9cf2753b4
commit 9ab7ff537d
4 changed files with 28 additions and 1 deletions

View File

@@ -190,7 +190,8 @@ bool wxTextCtrl::SetFont( const wxFont& font )
bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{
GetTextPeer()->SetStyle( start , end , style ) ;
if (GetTextPeer())
GetTextPeer()->SetStyle( start , end , style ) ;
return true ;
}
@@ -337,6 +338,13 @@ bool wxTextCtrl::AcceptsFocus() const
wxSize wxTextCtrl::DoGetBestSize() const
{
if (GetTextPeer())
{
wxSize size = GetTextPeer()->GetBestSize();
if (size.x > 0 && size.y > 0)
return size;
}
int wText, hText;
// these are the numbers from the HIG:
@@ -826,7 +834,11 @@ int wxTextWidgetImpl::GetNumberOfLines() const
for (size_t i = 0; i < content.length() ; i++)
{
#if wxOSX_USE_COCOA
if (content[i] == '\n')
#else
if (content[i] == '\r')
#endif
lines++;
}