merged 2 overloaded functions into a single membersections

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

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index 79d93657fbd3ed0f76f3c06d3e209219ccab2817..5ffa4f828b8f3f68b60d63cbe33fe207fee51c67 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        font.cpp
 // Purpose:     wxFont class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -18,9 +18,13 @@
 #include "wx/font.h"
 #include "wx/fontutil.h"
 #include "wx/gdicmn.h"
+#include "wx/utils.h"
 
 #include "wx/fontutil.h"
 
+#include "wx/mac/private.h"
+#include "ATSUnicode.h"
+
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
@@ -50,10 +54,11 @@ void wxFontRefData::Init(int pointSize,
     m_faceName = faceName;
     m_encoding = encoding;
 
-       m_macFontNum = 0 ;
-       m_macFontSize = 0;
-       m_macFontStyle = 0;
+    m_macFontNum = 0 ;
+    m_macFontSize = 0;
+    m_macFontStyle = 0;
     m_fontId = 0;
+    m_noAA = FALSE;
 }
 
 wxFontRefData::~wxFontRefData()
@@ -62,52 +67,65 @@ wxFontRefData::~wxFontRefData()
 
 void wxFontRefData::MacFindFont()
 {
-       if( m_faceName == "" )
-       {
-               switch( m_family )
-               {
-                       case wxDEFAULT :
-                               m_macFontNum = ::GetAppFont() ;
-                               break ;
-                       case wxDECORATIVE :
-                               ::GetFNum( "\pTimes" , &m_macFontNum) ;
-                               break ;
-                       case wxROMAN :
-                               ::GetFNum( "\pTimes" , &m_macFontNum) ;
-                               break ;
-                       case wxSCRIPT :
-                               ::GetFNum( "\pTimes" , &m_macFontNum) ;
-                               break ;
-                       case wxSWISS :
-                               ::GetFNum( "\pGeneva" , &m_macFontNum) ;
-                               break ;
-                       case wxMODERN :
-                               ::GetFNum( "\pMonaco" , &m_macFontNum) ;
-                               break ;
-               }
-       }
-       else
-       {
-               if ( m_faceName == "systemfont" )
-                       m_macFontNum = ::GetSysFont() ;
-               else if ( m_faceName == "applicationfont" )
-                       m_macFontNum = ::GetAppFont() ;
-               else
-               {
-                       strcpy(wxBuffer, m_faceName);
-                       C2PStr(wxBuffer);
-                       ::GetFNum( (unsigned char*) wxBuffer, &m_macFontNum);
-               }
-       }
-
-       m_macFontStyle = 0;
-       if (m_weight == wxBOLD)
-                m_macFontStyle |= bold;
-       if (m_style == wxITALIC || m_style == wxSLANT) 
-               m_macFontStyle |= italic;
-       if (m_underlined) 
-               m_macFontStyle |= underline;
-       m_macFontSize = m_pointSize ;
+    if( m_faceName.Length() == 0 )
+    {
+        switch( m_family )
+        {
+            case wxDEFAULT :
+                m_macFontNum = ::GetAppFont() ;
+                break ;
+            case wxDECORATIVE :
+                ::GetFNum( "\pTimes" , &m_macFontNum) ;
+                break ;
+            case wxROMAN :
+                ::GetFNum( "\pTimes" , &m_macFontNum) ;
+                break ;
+            case wxSCRIPT :
+                ::GetFNum( "\pTimes" , &m_macFontNum) ;
+                break ;
+            case wxSWISS :
+                ::GetFNum( "\pGeneva" , &m_macFontNum) ;
+                break ;
+            case wxMODERN :
+                ::GetFNum( "\pMonaco" , &m_macFontNum) ;
+                break ;
+        }
+        Str255 name ;
+        GetFontName( m_macFontNum , name ) ;
+        m_faceName = wxMacMakeStringFromPascal( name ) ;
+    }
+    else
+    {
+        if ( m_faceName == wxT("systemfont") )
+            m_macFontNum = ::GetSysFont() ;
+        else if ( m_faceName == wxT("applicationfont") )
+            m_macFontNum = ::GetAppFont() ;
+        else
+        {
+            Str255 fontname ;
+            wxMacStringToPascal( m_faceName , fontname ) ;
+            ::GetFNum( fontname, &m_macFontNum);
+        }
+    }
+
+    m_macFontStyle = 0;
+    if (m_weight == wxBOLD)
+         m_macFontStyle |= bold;
+    if (m_style == wxITALIC || m_style == wxSLANT) 
+        m_macFontStyle |= italic;
+    if (m_underlined) 
+        m_macFontStyle |= underline;
+    m_macFontSize = m_pointSize ;
+    
+    //TODO:if we supply the style as an additional parameter we must make a testing
+    //sequence in order to degrade gracefully while trying to maintain most of the style
+    //information, meanwhile we just take the normal font and apply the features after
+    OSStatus status = ::ATSUFONDtoFontID(m_macFontNum, normal /*qdStyle*/, (UInt32*)&m_macATSUFontID); 
+    /*
+    status = ATSUFindFontFromName ( (Ptr) m_faceName , strlen( m_faceName ) ,
+        kFontFullName,    kFontMacintoshPlatform, kFontRomanScript , kFontNoLanguage  ,  (UInt32*)&m_macATSUFontID ) ;
+    */
+    wxASSERT_MSG( status == noErr , wxT("couldn't retrieve font identifier") ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -116,8 +134,6 @@ void wxFontRefData::MacFindFont()
 
 void wxFont::Init()
 {
-    if ( wxTheFontList )
-        wxTheFontList->Append(this);
 }
 
 bool wxFont::Create(const wxNativeFontInfo& info)
@@ -152,13 +168,11 @@ bool wxFont::Create(int pointSize,
 
 wxFont::~wxFont()
 {
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject(this);
 }
 
 bool wxFont::RealizeResource()
 {
-       M_FONTDATA->MacFindFont() ;
+    M_FONTDATA->MacFindFont() ;
     return TRUE;
 }
 
@@ -173,17 +187,17 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
 
 void wxFont::Unshare()
 {
-       // Don't change shared data
-       if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)
     {
-               m_refData = new wxFontRefData();
-       }
+        m_refData = new wxFontRefData();
+    }
     else
     {
-               wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-               UnRef();
-               m_refData = ref;
-       }
+        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }
 }
 
 void wxFont::SetPointSize(int pointSize)
@@ -240,6 +254,15 @@ void wxFont::SetUnderlined(bool underlined)
     RealizeResource();
 }
 
+void wxFont::SetNoAntiAliasing( bool no )
+{
+    Unshare();
+
+    M_FONTDATA->SetNoAntiAliasing( no );
+
+    RealizeResource();
+}
+
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
@@ -282,3 +305,8 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
+bool wxFont::GetNoAntiAliasing()
+{
+    return M_FONTDATA->m_noAA;
+}
+