Fix error and some warnings - wxTopLevelWindowMac needs toplevel.h, but we only need...

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index cb3742316f1952910eeab343f6fdfaa743acaf26..6a6ab75b09dc42d63f0b49685127b9c37904e087 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -9,11 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "font.h"
 #endif
 
 #pragma implementation "font.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+

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


@@ -45,7 +46,8 @@ public:
         , m_macFontNum(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)
         , m_macFontNum(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)

-        , m_macATSUFontID()
+        , m_macATSUStyle(0)
+        , m_macATSUFontID(0)

     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
              wxT("Geneva"), wxFONTENCODING_DEFAULT);
     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
              wxT("Geneva"), wxFONTENCODING_DEFAULT);


@@ -64,6 +66,7 @@ public:
         , m_macFontNum(data.m_macFontNum)
         , m_macFontSize(data.m_macFontSize)
         , m_macFontStyle(data.m_macFontStyle)
         , m_macFontNum(data.m_macFontNum)
         , m_macFontSize(data.m_macFontSize)
         , m_macFontStyle(data.m_macFontStyle)

+        , m_macATSUStyle(0)

         , m_macATSUFontID(data.m_macATSUFontID)
     {
         Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
         , m_macATSUFontID(data.m_macATSUFontID)
     {
         Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,


@@ -88,6 +91,7 @@ public:
         , m_macFontNum(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)
         , m_macFontNum(0)
         , m_macFontSize(0)
         , m_macFontStyle(0)

+        , m_macATSUStyle(0)

         , m_macATSUFontID(0)
     {
         Init(size, family, style, weight, underlined, faceName, encoding);
         , m_macATSUFontID(0)
     {
         Init(size, family, style, weight, underlined, faceName, encoding);


@@ -108,14 +112,14 @@ protected:
               wxFontEncoding encoding);
 
     // font characterstics
               wxFontEncoding encoding);
 
     // font characterstics

-    int            m_fontId;
-    int            m_pointSize;
-    int            m_family;
-    int            m_style;
-    int            m_weight;
-    bool           m_underlined;
-    wxString       m_faceName;
-    wxFontEncoding m_encoding;
+    int             m_fontId;
+    int             m_pointSize;
+    int             m_family;
+    int             m_style;
+    int             m_weight;
+    bool            m_underlined;
+    wxString        m_faceName;
+    wxFontEncoding  m_encoding;

     bool            m_noAA;      // No anti-aliasing
     
 public:
     bool            m_noAA;      // No anti-aliasing
     
 public:


@@ -129,6 +133,7 @@ public:
     // contain some styles (special bold fonts etc) and
     // these are the additional qd styles that are not
     // included in the ATSU font id
     // contain some styles (special bold fonts etc) and
     // these are the additional qd styles that are not
     // included in the ATSU font id

+    ATSUStyle       m_macATSUStyle ;

     ATSUFontID      m_macATSUFontID;
     Style           m_macATSUAdditionalQDStyles ;
     
     ATSUFontID      m_macATSUFontID;
     Style           m_macATSUAdditionalQDStyles ;
     


@@ -171,6 +176,7 @@ void wxFontRefData::Init(int pointSize,
     m_macFontStyle = 0;
     m_macATSUFontID = 0;
     m_macATSUAdditionalQDStyles = 0 ;
     m_macFontStyle = 0;
     m_macATSUFontID = 0;
     m_macATSUAdditionalQDStyles = 0 ;

+    m_macATSUStyle = NULL ;

     
     m_macThemeFontID = kThemeCurrentPortFont ;
     m_noAA = FALSE;
     
     m_macThemeFontID = kThemeCurrentPortFont ;
     m_noAA = FALSE;


@@ -178,6 +184,11 @@ void wxFontRefData::Init(int pointSize,
 
 wxFontRefData::~wxFontRefData()
 {
 
 wxFontRefData::~wxFontRefData()
 {

+    if ( m_macATSUStyle )
+    {
+        ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
+        m_macATSUStyle = NULL ;
+    }

 }
 
 void wxFontRefData::MacFindFont()
 }
 
 void wxFontRefData::MacFindFont()


@@ -211,7 +222,7 @@ void wxFontRefData::MacFindFont()
                 case wxROMAN :
                 case wxDECORATIVE :
 #ifdef __WXMAC_OSX__
                 case wxROMAN :
                 case wxDECORATIVE :
 #ifdef __WXMAC_OSX__

-                    ::GetFNum( "\pTimes New Roman" , &m_macFontNum) ;
+                    ::GetFNum( "\pTimes" , &m_macFontNum) ;

 #else
                     ::GetFNum( "\pTimes" , &m_macFontNum) ;
 #endif
 #else
                     ::GetFNum( "\pTimes" , &m_macFontNum) ;
 #endif


@@ -260,6 +271,9 @@ 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 )
     Style atsuStyle = normal ;
     verify_noerr(::ATSUFONDtoFontID(m_macFontNum, atsuStyle , (UInt32*)&m_macATSUFontID) ); 
     if ( m_macFontStyle & bold )


@@ -289,7 +303,57 @@ void wxFontRefData::MacFindFont()
             m_macATSUFontID = test ;
         }
     }
             m_macATSUFontID = test ;
         }
     }

+    

     m_macATSUAdditionalQDStyles = m_macFontStyle & (~atsuStyle ) ;
     m_macATSUAdditionalQDStyles = m_macFontStyle & (~atsuStyle ) ;

+
+    if ( m_macATSUStyle )
+    {
+        ::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
+        m_macATSUStyle = NULL ;
+    }
+    OSStatus status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUStyle) ;
+    wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ;
+    ATSUAttributeTag atsuTags[] =
+    {
+            kATSUFontTag ,
+            kATSUSizeTag ,
+            kATSUVerticalCharacterTag,
+            kATSUQDBoldfaceTag ,
+            kATSUQDItalicTag ,
+            kATSUQDUnderlineTag ,
+            kATSUQDCondensedTag ,
+            kATSUQDExtendedTag ,
+    } ;
+    ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+    {
+            sizeof( ATSUFontID ) ,
+            sizeof( Fixed ) ,
+            sizeof( ATSUVerticalCharacterType),
+            sizeof( Boolean ) ,
+            sizeof( Boolean ) ,
+            sizeof( Boolean ) ,
+            sizeof( Boolean ) ,
+            sizeof( Boolean ) ,
+    } ;
+    Boolean kTrue = true ;
+    Boolean kFalse = false ;
+
+    ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
+    ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] =
+    {
+            &m_macATSUFontID ,
+            &atsuSize ,
+            &kHorizontal,
+            (m_macATSUAdditionalQDStyles & bold) ? &kTrue : &kFalse ,
+            (m_macATSUAdditionalQDStyles & italic) ? &kTrue : &kFalse ,
+            (m_macATSUAdditionalQDStyles & underline) ? &kTrue : &kFalse ,
+            (m_macATSUAdditionalQDStyles & condense) ? &kTrue : &kFalse ,
+            (m_macATSUAdditionalQDStyles & extend) ? &kTrue : &kFalse ,
+    } ;
+    status = ::ATSUSetAttributes((ATSUStyle)m_macATSUStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag) ,
+        atsuTags, atsuSizes, atsuValues);
+
+    wxASSERT_MSG( status == noErr , wxT("couldn't Modify ATSU style") ) ;

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


@@ -333,7 +397,7 @@ bool wxFont::Create(int pointSize,
 bool wxFont::MacCreateThemeFont(wxUint16 themeFontID )
 {
     UnRef();
 bool wxFont::MacCreateThemeFont(wxUint16 themeFontID )
 {
     UnRef();

-    m_refData = new wxFontRefData(12, 0, 0, wxNORMAL,false, wxEmptyString, wxFONTENCODING_DEFAULT);
+    m_refData = new wxFontRefData(12, wxDEFAULT , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ,false, wxEmptyString, wxFONTENCODING_DEFAULT);

     M_FONTDATA->m_macThemeFontID = themeFontID ;
     RealizeResource();
 
     M_FONTDATA->m_macThemeFontID = themeFontID ;
     RealizeResource();
 


@@ -445,31 +509,31 @@ void wxFont::SetNoAntiAliasing( bool no )
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_pointSize;
 }
 
 int wxFont::GetFamily() const
 {
     return M_FONTDATA->m_pointSize;
 }
 
 int wxFont::GetFamily() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {
     return M_FONTDATA->m_family;
 }
 
 int wxFont::GetStyle() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {
     return M_FONTDATA->m_style;
 }
 
 int wxFont::GetWeight() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {
     return M_FONTDATA->m_weight;
 }
 
 bool wxFont::GetUnderlined() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );

     return M_FONTDATA->m_underlined;
 }
 
     return M_FONTDATA->m_underlined;
 }
 


@@ -487,43 +551,49 @@ wxFontEncoding wxFont::GetEncoding() const
 
 bool wxFont::GetNoAntiAliasing() const
 {
 
 bool wxFont::GetNoAntiAliasing() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );

     return M_FONTDATA->m_noAA;
 }
 
 short wxFont::MacGetFontNum() const
 {
     return M_FONTDATA->m_noAA;
 }
 
 short wxFont::MacGetFontNum() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macFontNum;
 }
 
 short wxFont::MacGetFontSize() const
 {
     return M_FONTDATA->m_macFontNum;
 }
 
 short wxFont::MacGetFontSize() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macFontSize;
 }
 
 wxByte wxFont::MacGetFontStyle() const
 {
     return M_FONTDATA->m_macFontSize;
 }
 
 wxByte wxFont::MacGetFontStyle() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macFontStyle;
 }
 
 wxUint32 wxFont::MacGetATSUFontID() const
 {
     return M_FONTDATA->m_macFontStyle;
 }
 
 wxUint32 wxFont::MacGetATSUFontID() const
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macATSUFontID;
 }
 
     return M_FONTDATA->m_macATSUFontID;
 }
 

-wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
+void* wxFont::MacGetATSUStyle() const

 {
     wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
 {
     wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );

+    return M_FONTDATA->m_macATSUStyle;
+}
+
+wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
+{
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macATSUAdditionalQDStyles;
 }
 
 wxUint16 wxFont::MacGetThemeFontID() const 
 {
     return M_FONTDATA->m_macATSUAdditionalQDStyles;
 }
 
 wxUint16 wxFont::MacGetThemeFontID() const 
 {

-    wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
+    wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );

     return M_FONTDATA->m_macThemeFontID;
 }
 
     return M_FONTDATA->m_macThemeFontID;
 }