[ 1563875 ] wxTreeCtrl::FindItem asserts when item not found

[wxWidgets.git] / src / mac / classic / font.cpp

diff --git a/src/mac/classic/font.cpp b/src/mac/classic/font.cpp
index 7f4f120eb8ad291571a420a4898ad93625a6b1dd..e2757af968e2ef26f84de2fedcad0861771f4999 100644 (file)
--- a/src/mac/classic/font.cpp
+++ b/src/mac/classic/font.cpp
@@ -15,11 +15,15 @@
     #pragma hdrstop
 #endif
 
-#include "wx/string.h"
 #include "wx/font.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/fontutil.h"
-#include "wx/gdicmn.h"
-#include "wx/utils.h"
 
 #include "wx/fontutil.h"
 
@@ -166,7 +170,7 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::MacFindFont()
 {
-    if( m_faceName.Length() == 0 )
+    if( m_faceName.empty() )
     {
         switch( m_family )
         {
@@ -335,13 +339,15 @@ void wxFont::SetWeight(int weight)
     RealizeResource();
 }
 
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
 
     RealizeResource();
+
+    return wxFontBase::SetFaceName(faceName);
 }
 
 void wxFont::SetUnderlined(bool underlined)