From: Kevin Ollivier <kevino@theolliviers.com>
Date: Mon, 28 Jun 2004 19:02:16 +0000 (+0000)
Subject: Fixing crash due to referencing a NULL m_font.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1711ac7b908ac9b3caf88c76b27786e7ffed2b16?ds=inline

Fixing crash due to referencing a NULL m_font.


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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index c6cc88f72d..53e18bdc7b 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -859,9 +859,10 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 void wxWindowMac::MacUpdateControlFont() 
 {
 	ControlFontStyleRec	fontStyle;
-	if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+        wxFont myfont = GetFont();
+	if ( myfont.MacGetThemeFontID() != kThemeCurrentPortFont )
 	{
-	    switch( m_font.MacGetThemeFontID() )
+	    switch( myfont.MacGetThemeFontID() )
 	    {
 	        case kThemeSmallSystemFont :    fontStyle.font = kControlFontSmallSystemFont ;  break ;
 	        case 109 /*mini font */ :       fontStyle.font = -5 ;                           break ;
@@ -872,9 +873,9 @@ void wxWindowMac::MacUpdateControlFont()
 	}
 	else
 	{
-	    fontStyle.font = m_font.MacGetFontNum() ;
-	    fontStyle.style = m_font.MacGetFontStyle() ;
-	    fontStyle.size = m_font.MacGetFontSize() ;
+	    fontStyle.font = myfont.MacGetFontNum() ;
+	    fontStyle.style = myfont.MacGetFontStyle() ;
+	    fontStyle.size = myfont.MacGetFontSize() ;
 	    fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
 	}