AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adapting to new m_font handling in base (it's not always valid, so use GetFont())

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2008-05-13 20:52:56 +00:00
parent 2059910d0b
commit 6662d8c097
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/window.cpp
View File

@ -2060,8 +2060,12 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont ) const
{
const wxFont *fontToUse = theFont;
wxFont tempFont;
if ( !fontToUse )
fontToUse = &m_font;
{
tempFont = GetFont();
fontToUse = &tempFont;
}
wxClientDC dc( (wxWindowMac*) this ) ;
wxCoord lx,ly,ld,le ;