tried to make Close() docs more clear

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index ecffc9fd941d59244dc5d710d92340b785981080..d1b4798cc40e0bf630f2eabf58f5409118611bc7 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -16,10 +16,15 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 #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
@@ -49,9 +54,9 @@ 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;
 }
 
@@ -84,6 +89,10 @@ void wxFontRefData::MacFindFont()
                                ::GetFNum( "\pMonaco" , &m_macFontNum) ;
                                break ;
                }
+               Str255 name ;
+               GetFontName( m_macFontNum , name ) ;
+               CopyPascalStringToC( name , (char*) name ) ;
+               m_faceName = (char*) name ;
        }
        else
        {
@@ -93,9 +102,13 @@ void wxFontRefData::MacFindFont()
                        m_macFontNum = ::GetAppFont() ;
                else
                {
-                       strcpy(wxBuffer, m_faceName);
-                       C2PStr(wxBuffer);
-                       ::GetFNum( (unsigned char*) wxBuffer, &m_macFontNum);
+#if TARGET_CARBON
+                       c2pstrcpy( (StringPtr) wxBuffer, m_faceName ) ;
+#else
+                       strcpy( (char *) wxBuffer, m_faceName ) ;
+                       c2pstr( (char *) wxBuffer ) ;
+#endif
+                       ::GetFNum( (StringPtr) wxBuffer, &m_macFontNum);
                }
        }
 
@@ -107,6 +120,16 @@ void wxFontRefData::MacFindFont()
        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 , "couldn't retrieve font identifier" ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -115,8 +138,12 @@ void wxFontRefData::MacFindFont()
 
 void wxFont::Init()
 {
-    if ( wxTheFontList )
-        wxTheFontList->Append(this);
+}
+
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    return Create(info.pointSize, info.family, info.style, info.weight,
+                  info.underlined, info.faceName, info.encoding);
 }
 
 wxFont::wxFont(const wxString& fontdesc)
@@ -143,16 +170,8 @@ bool wxFont::Create(int pointSize,
     return TRUE;
 }
 
-bool wxFont::Create(const wxNativeFontInfo& info)
-{
-    return Create(info.pointSize, info.family, info.style, info.weight,
-                  info.underlined, info.faceName, info.encoding);
-}
-
 wxFont::~wxFont()
 {
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject(this);
 }
 
 bool wxFont::RealizeResource()