Added define to STC VC++ project file

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

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index ecffc9fd941d59244dc5d710d92340b785981080..ab906cad670ebc795f1f203b7454e501793c052f 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -16,10 +16,15 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"

+#include "wx/fontutil.h"

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

+#include "wx/utils.h"

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

+#include "wx/mac/private.h"
+#include "ATSUnicode.h"
+

 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 #endif


@@ -93,9 +98,13 @@ void wxFontRefData::MacFindFont()
                        m_macFontNum = ::GetAppFont() ;
                else
                {
                        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 +116,12 @@ void wxFontRefData::MacFindFont()
        if (m_underlined) 
                m_macFontStyle |= underline;
        m_macFontSize = m_pointSize ;
        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); 
+       wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -115,8 +130,12 @@ void wxFontRefData::MacFindFont()
 
 void wxFont::Init()
 {
 
 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)
 }
 
 wxFont::wxFont(const wxString& fontdesc)


@@ -143,16 +162,8 @@ bool wxFont::Create(int pointSize,
     return TRUE;
 }
 
     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()
 {
 wxFont::~wxFont()
 {

-    if (wxTheFontList)
-        wxTheFontList->DeleteObject(this);

 }
 
 bool wxFont::RealizeResource()
 }
 
 bool wxFont::RealizeResource()