don't create non-existing groups in HasEntry()

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 517f232e701fb5a60420b160ee01d74c216a6829..ff9671bd6c5765b9ed79128900fb31b15aba1450 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.cpp
+// Name:        src/mac/carbon/font.cpp

 // Purpose:     wxFont class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxFont class
 // Author:      Stefan Csomor
 // Modified by:


@@ -11,11 +11,16 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/string.h"

 #include "wx/font.h"
 #include "wx/font.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/gdicmn.h"
+#endif
+

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

-#include "wx/gdicmn.h"
-#include "wx/utils.h"

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


@@ -39,10 +44,10 @@ public:
         , m_family(wxDEFAULT)
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
         , m_family(wxDEFAULT)
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)

-        , m_underlined(FALSE)
+        , m_underlined(false)

         , m_faceName(wxT("applicationfont"))
         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_faceName(wxT("applicationfont"))
         , m_encoding(wxFONTENCODING_DEFAULT)

-        , m_macFontNum(0)
+        , m_macFontFamily(0)

         , m_macFontSize(0)
         , m_macFontStyle(0)
         , m_macATSUStyle(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)
         , m_macATSUStyle(0)


@@ -62,7 +67,7 @@ public:
         , m_underlined(data.m_underlined)
         , m_faceName(data.m_faceName)
         , m_encoding(data.m_encoding)
         , m_underlined(data.m_underlined)
         , m_faceName(data.m_faceName)
         , m_encoding(data.m_encoding)

-        , m_macFontNum(data.m_macFontNum)
+        , m_macFontFamily(data.m_macFontFamily)

         , m_macFontSize(data.m_macFontSize)
         , m_macFontStyle(data.m_macFontStyle)
         , m_macATSUStyle(0)
         , m_macFontSize(data.m_macFontSize)
         , m_macFontStyle(data.m_macFontStyle)
         , m_macATSUStyle(0)


@@ -87,7 +92,7 @@ public:
         , m_underlined(underlined)
         , m_faceName(faceName)
         , m_encoding(encoding)
         , m_underlined(underlined)
         , m_faceName(faceName)
         , m_encoding(encoding)

-        , m_macFontNum(0)
+        , m_macFontFamily(0)

         , m_macFontSize(0)
         , m_macFontStyle(0)
         , m_macATSUStyle(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)
         , m_macATSUStyle(0)


@@ -104,7 +109,7 @@ public:
     bool GetNoAntiAliasing() const
     { return m_noAA; }
 
     bool GetNoAntiAliasing() const
     { return m_noAA; }
 

-    void MacFindFont() ;
+    void MacFindFont();

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -128,9 +133,9 @@ protected:
     bool            m_noAA;      // No anti-aliasing
 
 public:
     bool            m_noAA;      // No anti-aliasing
 
 public:

-    short           m_macFontNum;
-    short           m_macFontSize;
-    Style           m_macFontStyle;
+    FMFontFamily    m_macFontFamily;
+    FMFontSize      m_macFontSize;
+    FMFontStyle     m_macFontStyle;

 
     // ATSU Font Information
 
 
     // ATSU Font Information
 


@@ -140,7 +145,7 @@ public:
     // included in the ATSU font id
     ATSUStyle       m_macATSUStyle ;
     ATSUFontID      m_macATSUFontID;
     // included in the ATSU font id
     ATSUStyle       m_macATSUStyle ;
     ATSUFontID      m_macATSUFontID;

-    Style           m_macATSUAdditionalQDStyles ;
+    FMFontStyle     m_macATSUAdditionalQDStyles ;

 
     // for true themeing support we must store the correct font
     // information here, as this speeds up and optimizes rendering
 
     // for true themeing support we must store the correct font
     // information here, as this speeds up and optimizes rendering


@@ -175,7 +180,7 @@ void wxFontRefData::Init(int pointSize,
     m_faceName = faceName;
     m_encoding = encoding;
 
     m_faceName = faceName;
     m_encoding = encoding;
 

-    m_macFontNum = 0 ;
+    m_macFontFamily = 0 ;

     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_macATSUFontID = 0;
     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_macATSUFontID = 0;


@@ -197,12 +202,15 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::MacFindFont()
 {
 
 void wxFontRefData::MacFindFont()
 {

+    OSStatus status ;
+
+    Str255 qdFontName ;

     if ( m_macThemeFontID != kThemeCurrentPortFont )
     {
     if ( m_macThemeFontID != kThemeCurrentPortFont )
     {

-        Str255 fontName ;
-
-        GetThemeFont( m_macThemeFontID, GetApplicationScript(), fontName, &m_macFontSize, &m_macFontStyle );
-        m_faceName = wxMacMakeStringFromPascal( fontName ) ;
+        Style style ;
+        GetThemeFont( m_macThemeFontID, GetApplicationScript(), qdFontName, &m_macFontSize, &style );
+        m_macFontStyle = style ;
+        m_faceName = wxMacMakeStringFromPascal( qdFontName );

         if ( m_macFontStyle & bold )
             m_weight = wxBOLD ;
         else
         if ( m_macFontStyle & bold )
             m_weight = wxBOLD ;
         else


@@ -211,56 +219,58 @@ void wxFontRefData::MacFindFont()
             m_style = wxITALIC ;
         if ( m_macFontStyle & underline )
             m_underlined = true ;
             m_style = wxITALIC ;
         if ( m_macFontStyle & underline )
             m_underlined = true ;

-        ::GetFNum( fontName, &m_macFontNum );

         m_pointSize = m_macFontSize ;
         m_pointSize = m_macFontSize ;

+
+        m_macFontFamily = FMGetFontFamilyFromName( qdFontName );

     }
     else
     {
     }
     else
     {

-        if ( m_faceName.Length() == 0 )
+        if ( m_faceName.empty() )

         {
         {

-            switch ( m_family )
+            if ( m_family == wxDEFAULT )

             {
             {

-                case wxDEFAULT :
-                    m_macFontNum = ::GetAppFont();
-                    break ;
-
-                case wxSCRIPT :
-                case wxROMAN :
-                case wxDECORATIVE :
-                    ::GetFNum( "\pTimes", &m_macFontNum );
-                    break ;
-
-                case wxSWISS :
-#ifdef __WXMAC_OSX__
-                    ::GetFNum( "\pLucida Grande", &m_macFontNum );
-#else
-                    ::GetFNum( "\pGeneva", &m_macFontNum );
-#endif
-                    break ;
-
-                case wxMODERN :
-                    ::GetFNum( "\pMonaco", &m_macFontNum );
-                    break ;
-
-                default:
-                    break ;
+                m_macFontFamily = GetAppFont();
+                FMGetFontFamilyName(m_macFontFamily,qdFontName);
+                m_faceName = wxMacMakeStringFromPascal( qdFontName );
+            }
+            else
+            {
+                switch ( m_family )
+                {
+                    case wxSCRIPT :
+                    case wxROMAN :
+                    case wxDECORATIVE :
+                        m_faceName = wxT("Times");
+                        break ;
+
+                    case wxSWISS :
+                        m_faceName =  wxT("Lucida Grande");
+                        break ;
+
+                    case wxMODERN :
+                        m_faceName =  wxT("Monaco");
+                        break ;
+
+                    default:
+                        m_faceName =  wxT("Times");
+                        break ;
+                }
+                wxMacStringToPascal( m_faceName , qdFontName );
+                m_macFontFamily = FMGetFontFamilyFromName( qdFontName );

             }
             }

-
-            Str255 name ;
-            ::GetFontName( m_macFontNum , name ) ;
-            m_faceName = wxMacMakeStringFromPascal( name ) ;

         }
         else
         {
             if ( m_faceName == wxT("systemfont") )
         }
         else
         {
             if ( m_faceName == wxT("systemfont") )

-                m_macFontNum = ::GetSysFont() ;
+                m_macFontFamily = GetSysFont();

             else if ( m_faceName == wxT("applicationfont") )
             else if ( m_faceName == wxT("applicationfont") )

-                m_macFontNum = ::GetAppFont() ;
+                m_macFontFamily = GetAppFont();

             else
             {
             else
             {

-                Str255 fontname ;
-                wxMacStringToPascal( m_faceName , fontname ) ;
-                ::GetFNum( fontname, &m_macFontNum);
+                wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
+                ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );
+                wxASSERT_MSG( atsfamily != (ATSFontFamilyRef) -1 , wxT("ATSFontFamilyFindFromName failed") );
+                m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily );

             }
         }
 
             }
         }
 


@@ -276,41 +286,13 @@ void wxFontRefData::MacFindFont()
 
     // we try to get as much styles as possible into ATSU
 
 
     // we try to get as much styles as possible into ATSU
 

-    Fixed atsuSize = IntToFixed( m_macFontSize ) ;
-
-    Style atsuStyle = normal ;
-    verify_noerr(::ATSUFONDtoFontID(m_macFontNum, atsuStyle , (UInt32*)&m_macATSUFontID) );
-    if ( m_macFontStyle & bold )
-    {
-        ATSUFontID test ;
-        if ( ::ATSUFONDtoFontID(m_macFontNum, atsuStyle | bold , &test) == noErr )
-        {
-            atsuStyle |= bold ;
-            m_macATSUFontID = test ;
-        }
-    }
-
-    if ( m_macFontStyle & italic )
-    {
-        ATSUFontID test ;
-        if ( ::ATSUFONDtoFontID(m_macFontNum, atsuStyle | italic , &test) == noErr )
-        {
-            atsuStyle |= italic ;
-            m_macATSUFontID = test ;
-        }
-    }

 
 

-    if ( m_macFontStyle & underline )
-    {
-        ATSUFontID test ;
-        if ( ::ATSUFONDtoFontID(m_macFontNum, atsuStyle | underline , &test) == noErr )
-        {
-            atsuStyle |= underline ;
-            m_macATSUFontID = test ;
-        }
-    }
+    // ATSUFontID and FMFont are equivalent
+    FMFontStyle intrinsicStyle = 0 ;
+    status = FMGetFontFromFontFamilyInstance( m_macFontFamily , m_macFontStyle , &m_macATSUFontID , &intrinsicStyle);
+    wxASSERT_MSG( status == noErr , wxT("couldn't get an ATSUFont from font family") );

 
 

-    m_macATSUAdditionalQDStyles = m_macFontStyle & (~atsuStyle ) ;
+    m_macATSUAdditionalQDStyles = m_macFontStyle & (~intrinsicStyle );

 
     if ( m_macATSUStyle )
     {
 
     if ( m_macATSUStyle )
     {


@@ -318,35 +300,36 @@ void wxFontRefData::MacFindFont()
         m_macATSUStyle = NULL ;
     }
 
         m_macATSUStyle = NULL ;
     }
 

-    OSStatus status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUStyle) ;
-    wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ;
+    status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUStyle);
+    wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") );

 
     ATSUAttributeTag atsuTags[] =
     {
 
     ATSUAttributeTag atsuTags[] =
     {

-            kATSUFontTag ,
-            kATSUSizeTag ,
-            kATSUVerticalCharacterTag,
-            kATSUQDBoldfaceTag ,
-            kATSUQDItalicTag ,
-            kATSUQDUnderlineTag ,
-            kATSUQDCondensedTag ,
-            kATSUQDExtendedTag ,
+        kATSUFontTag ,
+        kATSUSizeTag ,
+        kATSUVerticalCharacterTag,
+        kATSUQDBoldfaceTag ,
+        kATSUQDItalicTag ,
+        kATSUQDUnderlineTag ,
+        kATSUQDCondensedTag ,
+        kATSUQDExtendedTag ,

     };
     ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
     {
     };
     ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
     {

-            sizeof( ATSUFontID ) ,
-            sizeof( Fixed ) ,
-            sizeof( ATSUVerticalCharacterType),
-            sizeof( Boolean ) ,
-            sizeof( Boolean ) ,
-            sizeof( Boolean ) ,
-            sizeof( Boolean ) ,
-            sizeof( Boolean ) ,
+        sizeof( ATSUFontID ) ,
+        sizeof( Fixed ) ,
+        sizeof( ATSUVerticalCharacterType),
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,
+        sizeof( Boolean ) ,

     };
 
     Boolean kTrue = true ;
     Boolean kFalse = false ;
 
     };
 
     Boolean kTrue = true ;
     Boolean kFalse = false ;
 

+    Fixed atsuSize = IntToFixed( m_macFontSize );

     ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
     ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
     {
     ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
     ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
     {


@@ -365,17 +348,13 @@ void wxFontRefData::MacFindFont()
         sizeof(atsuTags) / sizeof(ATSUAttributeTag) ,
         atsuTags, atsuSizes, atsuValues);
 
         sizeof(atsuTags) / sizeof(ATSUAttributeTag) ,
         atsuTags, atsuSizes, atsuValues);
 

-    wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ;
+    wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );

 }
 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 

-void wxFont::Init()
-{
-}
-

 bool wxFont::Create(const wxNativeFontInfo& info)
 {
     return Create(
 bool wxFont::Create(const wxNativeFontInfo& info)
 {
     return Create(


@@ -429,7 +408,7 @@ wxFont::~wxFont()
 
 bool wxFont::RealizeResource()
 {
 
 bool wxFont::RealizeResource()
 {

-    M_FONTDATA->MacFindFont() ;
+    M_FONTDATA->MacFindFont();

 
     return true;
 }
 
     return true;
 }


@@ -494,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)


@@ -587,7 +568,7 @@ short wxFont::MacGetFontNum() const
 {
     wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
 
 {
     wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_macFontNum;
+    return M_FONTDATA->m_macFontFamily;

 }
 
 short wxFont::MacGetFontSize() const
 }
 
 short wxFont::MacGetFontSize() const


@@ -641,4 +622,3 @@ const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
 
     return &(M_FONTDATA->m_info);
 }
 
     return &(M_FONTDATA->m_info);
 }

-