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

fix for potention crash when conversion fails

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-06-29 08:07:50 +00:00
parent 8b6682b97c
commit 1ae82ba9f2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mac/carbon/dc.cpp
View File

@@ -1650,7 +1650,8 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
#endif #endif
{ {
wxCharBuffer text = linetext.mb_str(wxConvLocal) ; wxCharBuffer text = linetext.mb_str(wxConvLocal) ;
::DrawText( text , 0 , strlen(text) ) ; if ( text.data() != NULL )
::DrawText( text , 0 , strlen(text) ) ;
} }
} }
@@ -1718,7 +1719,10 @@ void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *he
else else
{ {
wxCharBuffer text = linetext.mb_str(wxConvLocal) ; wxCharBuffer text = linetext.mb_str(wxConvLocal) ;
curwidth = ::TextWidth( text , 0 , strlen(text) ) ; if ( text.data() != NULL )
curwidth = ::TextWidth( text , 0 , strlen(text) ) ;
else
curwidth = 0 ;
} }
if ( curwidth > *width ) if ( curwidth > *width )