make sure native font exists, before asking about fixed width

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 11853c8e5ee7511bd05afbc382190cab9f446632..a0a345c38f3c7add90a5b6cb4c2bc867d6c8c4ac 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -742,8 +742,11 @@ wxSize wxFont::GetPixelSize() const
 
 bool wxFont::IsFixedWidth() const
 {
 
 bool wxFont::IsFixedWidth() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , wxFONTWEIGHT_MAX, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );

     
     

+    // cast away constness otherwise lazy font resolution is not possible
+    const_cast<wxFont *>(this)->RealizeResource();
+

     return M_FONTDATA->IsFixedWidth();
 }
 
     return M_FONTDATA->IsFixedWidth();
 }