Document lack of wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK under OS X.

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 573f8681d0995c6a269db6c1d9b16f1d1099535e..634453ec6a335b4e4c4b034ceff938301ba91a56 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:


@@ -139,6 +137,8 @@ public:
     }
 
     wxFontEncoding GetEncoding() const { return m_info.GetEncoding(); }
     }
 
     wxFontEncoding GetEncoding() const { return m_info.GetEncoding(); }

+    
+    bool IsFixedWidth() const;

 
     void Free();
 
 
     void Free();
 


@@ -177,7 +177,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;


@@ -274,7 +274,6 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
     Init();
 
 #if wxOSX_USE_CORE_TEXT
     Init();
 
 #if wxOSX_USE_CORE_TEXT

-    if (  UMAGetSystemVersion() >= 0x1050 )

     {
         CTFontUIFontType uifont = kCTFontSystemFontType;
         switch( font )
     {
         CTFontUIFontType uifont = kCTFontSystemFontType;
         switch( font )


@@ -467,7 +466,6 @@ void wxFontRefData::MacFindFont()
     m_info.EnsureValid();
 
 #if wxOSX_USE_CORE_TEXT
     m_info.EnsureValid();
 
 #if wxOSX_USE_CORE_TEXT

-    if (  UMAGetSystemVersion() >= 0x1050 )

     {
          CTFontSymbolicTraits traits = 0;
 
     {
          CTFontSymbolicTraits traits = 0;
 


@@ -544,6 +542,16 @@ void wxFontRefData::MacFindFont()
     m_fontValid = true;
 }
 
     m_fontValid = true;
 }
 

+bool wxFontRefData::IsFixedWidth() const
+{
+#if wxOSX_USE_CORE_TEXT
+    CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(m_ctFont);
+    return (traits & kCTFontMonoSpaceTrait) != 0;
+#else
+    return false;
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------


@@ -659,7 +667,7 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
 
 void wxFont::SetPointSize(int pointSize)
 {
 
 void wxFont::SetPointSize(int pointSize)
 {

-    if ( M_FONTDATA->GetPointSize() == pointSize )
+    if ( M_FONTDATA != NULL && M_FONTDATA->GetPointSize() == pointSize )

         return;
 
     AllocExclusive();
         return;
 
     AllocExclusive();


@@ -732,6 +740,16 @@ wxSize wxFont::GetPixelSize() const
 #endif
 }
 
 #endif
 }
 

+bool wxFont::IsFixedWidth() const
+{
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );
+    
+    // cast away constness otherwise lazy font resolution is not possible
+    const_cast<wxFont *>(this)->RealizeResource();
+
+    return M_FONTDATA->IsFixedWidth();
+}
+

 wxFontFamily wxFont::DoGetFamily() const
 {
     return M_FONTDATA->GetFamily();
 wxFontFamily wxFont::DoGetFamily() const
 {
     return M_FONTDATA->GetFamily();


@@ -895,7 +913,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();


@@ -1219,6 +1237,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)


@@ -1283,3 +1307,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))
+{
+}
+
+