X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2edd0e7c6689e0668a9fcc4fcde74dcdee3e69d8..75d07c0a3a675eb1504779451a170264490ebaa1:/src/mac/font.cpp

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index 2d3e5f9033..d94805d819 100644
--- 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__
@@ -22,6 +22,9 @@
 
 #include "wx/fontutil.h"
 
+#include "wx/mac/private.h"
+#include "ATSUnicode.h"
+
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
@@ -51,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()
@@ -63,56 +67,68 @@ 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
-		{
-#if TARGET_CARBON
-			c2pstrcpy( (StringPtr) wxBuffer, m_faceName ) ;
-#else
-			strcpy( (char *) wxBuffer, m_faceName ) ;
-			c2pstr( (char *) wxBuffer ) ;
-#endif
-			::GetFNum( (StringPtr) 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
+#ifdef __WXDEBUG__
+    OSStatus status =
+#endif // __WXDEBUG__
+        ::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") ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -159,7 +175,7 @@ wxFont::~wxFont()
 
 bool wxFont::RealizeResource()
 {
-	M_FONTDATA->MacFindFont() ;
+    M_FONTDATA->MacFindFont() ;
     return TRUE;
 }
 
@@ -174,17 +190,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)
@@ -241,6 +257,15 @@ void wxFont::SetUnderlined(bool underlined)
     RealizeResource();
 }
 
+void wxFont::SetNoAntiAliasing( bool no )
+{
+    Unshare();
+
+    M_FONTDATA->SetNoAntiAliasing( no );
+
+    RealizeResource();
+}
+
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
@@ -283,3 +308,8 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
+bool wxFont::GetNoAntiAliasing()
+{
+    return M_FONTDATA->m_noAA;
+}
+