Compilation fixes for Cairo-based wxGraphicsContext code under MSW.

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 360a7fa9aa3907e28ea3fcad89e31fdd7ae5e885..d4a458472207305c192dc23d2d83e4474e1e3e04 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -31,8 +31,6 @@
 #include <map>
 #include <string>
 
 #include <map>
 #include <string>
 

-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-

 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
 public:
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
 public:


@@ -177,7 +175,7 @@ public:
 
 #define M_FONTDATA ((wxFontRefData*)m_refData)
 
 
 #define M_FONTDATA ((wxFontRefData*)m_refData)
 

-wxFontRefData::wxFontRefData(const wxFontRefData& data)
+wxFontRefData::wxFontRefData(const wxFontRefData& data) : wxGDIRefData()

 {
     Init();
     m_info = data.m_info;
 {
     Init();
     m_info = data.m_info;


@@ -814,7 +812,6 @@ void * wxFont::MacGetATSUStyle() const
     return M_FONTDATA->m_macATSUStyle;
 }
 
     return M_FONTDATA->m_macATSUStyle;
 }
 

-#if WXWIN_COMPATIBILITY_2_8

 wxUint32 wxFont::MacGetATSUFontID() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") );
 wxUint32 wxFont::MacGetATSUFontID() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") );


@@ -836,8 +833,6 @@ wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
 }
 #endif
 
 }
 #endif
 

-#endif
-

 #if wxOSX_USE_CORE_TEXT
 
 CTFontRef wxFont::OSXGetCTFont() const
 #if wxOSX_USE_CORE_TEXT
 
 CTFontRef wxFont::OSXGetCTFont() const


@@ -898,7 +893,7 @@ UIFont* wxFont::OSXGetUIFont() const
 const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
 const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );

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


@@ -1222,6 +1217,12 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
     return m_encoding;
 }
 
     return m_encoding;
 }
 

+bool wxNativeFontInfo::GetStrikethrough() const
+{
+    return false;
+}
+
+

 // changing the font descriptor
 
 void wxNativeFontInfo::SetPointSize(int pointsize)
 // changing the font descriptor
 
 void wxNativeFontInfo::SetPointSize(int pointsize)


@@ -1286,3 +1287,9 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
     m_encoding = encoding_;
     // not reflected in native descriptors
 }
     m_encoding = encoding_;
     // not reflected in native descriptors
 }

+
+void wxNativeFontInfo::SetStrikethrough(bool WXUNUSED(strikethrough))
+{
+}
+
+