removed unneeded makefiles

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

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index bb1c2b4939f4348b1b2b4e96335f40c3118ba916..ef0ecc73b6c76349da857f6d519f1383b57a9c9f 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -23,7 +23,7 @@
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"

-#include "ATSUnicode.h"
+#include <ATSUnicode.h>

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)


@@ -370,6 +370,8 @@ void wxFont::SetNoAntiAliasing( bool no )
 // accessors
 // ----------------------------------------------------------------------------
 
 // accessors
 // ----------------------------------------------------------------------------
 

+// TODO: insert checks everywhere for M_FONTDATA == NULL!
+

 int wxFont::GetPointSize() const
 {
     return M_FONTDATA->m_pointSize;
 int wxFont::GetPointSize() const
 {
     return M_FONTDATA->m_pointSize;


@@ -413,6 +415,26 @@ bool wxFont::GetNoAntiAliasing()
     return M_FONTDATA->m_noAA;
 }
 
     return M_FONTDATA->m_noAA;
 }
 

+short wxFont::GetMacFontNum() const
+{
+    return M_FONTDATA->m_macFontNum;
+}
+
+short wxFont::GetMacFontSize() const
+{
+    return M_FONTDATA->m_macFontSize;
+}
+
+wxByte wxFont::GetMacFontStyle() const
+{
+    return M_FONTDATA->m_macFontStyle;
+}
+
+wxUint32 wxFont::GetMacATSUFontID() const
+{
+    return M_FONTDATA->m_macATSUFontID;
+}
+

 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );