add wx/univ/tglbtn.h to wxUniv headers

[wxWidgets.git] / src / cocoa / font.cpp

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index c8aa187d02a88996eb5cdb92c69984a81e4cf29f..bfbed70f383bba9336cc9e8016613ba4ac883d69 100644 (file)
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -11,12 +11,13 @@
 
 #include "wx/wxprec.h"
 
+#include "wx/font.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/font.h"
-#include "wx/gdicmn.h"
 #include "wx/encinfo.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
@@ -36,6 +37,8 @@ wxFontRefData::~wxFontRefData()
     // TODO: delete font data
 }
 
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
 bool wxFont::Create(const wxNativeFontInfo&)
 {
     return false;
@@ -57,7 +60,10 @@ int wxFont::GetPointSize() const
 
 bool wxFont::GetUnderlined() const
 {
-    return false;
+    if(M_FONTDATA)
+        return M_FONTDATA->m_underlined;
+    else
+        return false;
 }
 
 int wxFont::GetStyle() const
@@ -160,13 +166,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)