The Great wxRegion Refactoring:

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 9f08a80e6be74628e4decd9645ebf46c97a14205..ff9671bd6c5765b9ed79128900fb31b15aba1450 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -17,10 +17,10 @@
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/intl.h"

+    #include "wx/gdicmn.h"

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/gdicmn.h"

 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"


@@ -473,13 +473,15 @@ void wxFont::SetWeight(int weight)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
 
     RealizeResource();
 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
 
     RealizeResource();

+
+    return wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)