compilation fix for wxGTK

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

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index d7d7b12cc80f13b69df3531fd0a86bd03102be4e..d425b3cf95f1718e3cfd96704a48c1019afaface 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -16,15 +16,16 @@
 #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"

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

-
-
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -79,7 +80,7 @@ void wxFontRefData::MacFindFont()
                                ::GetFNum( "\pTimes" , &m_macFontNum) ;
                                break ;
                        case wxSWISS :
                                ::GetFNum( "\pTimes" , &m_macFontNum) ;
                                break ;
                        case wxSWISS :

-                               ::GetFNum( "\pHelvetica" , &m_macFontNum) ;
+                               ::GetFNum( "\pGeneva" , &m_macFontNum) ;

                                break ;
                        case wxMODERN :
                                ::GetFNum( "\pMonaco" , &m_macFontNum) ;
                                break ;
                        case wxMODERN :
                                ::GetFNum( "\pMonaco" , &m_macFontNum) ;


@@ -94,9 +95,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);

                }
        }
 
                }
        }
 


@@ -120,6 +125,19 @@ void wxFont::Init()
         wxTheFontList->Append(this);
 }
 
         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)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);
+}
+

 bool wxFont::Create(int pointSize,
                     int family,
                     int style,
 bool wxFont::Create(int pointSize,
                     int family,
                     int style,


@@ -149,6 +167,15 @@ bool wxFont::RealizeResource()
     return TRUE;
 }
 
     return TRUE;
 }
 

+void wxFont::SetEncoding(wxFontEncoding encoding)
+{
+    Unshare();
+
+    M_FONTDATA->m_encoding = encoding;
+
+    RealizeResource();
+}
+

 void wxFont::Unshare()
 {
        // Don't change shared data
 void wxFont::Unshare()
 {
        // Don't change shared data


@@ -232,11 +259,6 @@ int wxFont::GetFamily() const
     return M_FONTDATA->m_family;
 }
 
     return M_FONTDATA->m_family;
 }
 

-int wxFont::GetFontId() const
-{
-    return M_FONTDATA->m_fontId;
-}
-

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