test for __DARWIN__ with ifdef, not if

[wxWidgets.git] / src / cocoa / font.mm

diff --git a/src/cocoa/font.mm b/src/cocoa/font.mm
index bfbed70f383bba9336cc9e8016613ba4ac883d69..26a0226aba005fb5d58a4422f1e8d04d973796f9 100644 (file)
--- a/src/cocoa/font.mm
+++ b/src/cocoa/font.mm
@@ -18,18 +18,74 @@
     #include "wx/gdicmn.h"
 #endif
 
     #include "wx/gdicmn.h"
 #endif
 

+#include "wx/fontutil.h"

 #include "wx/encinfo.h"
 
 #include "wx/encinfo.h"
 

+class WXDLLEXPORT wxFontRefData: public wxGDIRefData
+{
+    friend class WXDLLIMPEXP_FWD_CORE wxFont;
+public:
+    wxFontRefData()
+    :   m_fontId(0)
+    {
+        Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
+             wxT("Geneva"), wxFONTENCODING_DEFAULT);
+    }
+
+    wxFontRefData(const wxFontRefData& data)
+    :   wxGDIRefData()
+    ,   m_fontId(data.m_fontId)
+    ,   m_info(data.m_info)
+    {
+    }
+
+    wxFontRefData(const wxNativeFontInfo& info)
+    :   wxGDIRefData()
+    ,   m_fontId(0)
+    ,   m_info(info)
+    {}
+
+    wxFontRefData(int size,
+                  int family,
+                  int style,
+                  int weight,
+                  bool underlined,
+                  const wxString& faceName,
+                  wxFontEncoding encoding)
+    :   m_fontId(0)
+    {
+        Init(size, family, style, weight, underlined, faceName, encoding);
+    }
+
+    virtual ~wxFontRefData();
+protected:
+    // common part of all ctors
+    void Init(int size,
+              int family,
+              int style,
+              int weight,
+              bool underlined,
+              const wxString& faceName,
+              wxFontEncoding encoding);
+
+    // font characterstics
+    int            m_fontId;
+    wxNativeFontInfo m_info;
+
+public:
+};
+

 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 void wxFontRefData::Init(int size, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding)
 {
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 void wxFontRefData::Init(int size, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding)
 {

-    m_family = family;
-    m_style = style;
-    m_weight = weight;
-    m_underlined = underlined;
-    m_faceName = faceName;
-    m_encoding = encoding;
+    m_info.pointSize = size;
+    m_info.family = static_cast<wxFontFamily>(family);
+    m_info.style = static_cast<wxFontStyle>(style);
+    m_info.weight = static_cast<wxFontWeight>(weight);
+    m_info.underlined = underlined;
+    m_info.faceName = faceName;
+    m_info.encoding = encoding;

 }
 
 wxFontRefData::~wxFontRefData()
 }
 
 wxFontRefData::~wxFontRefData()


@@ -39,9 +95,12 @@ wxFontRefData::~wxFontRefData()
 
 #define M_FONTDATA ((wxFontRefData*)m_refData)
 
 
 #define M_FONTDATA ((wxFontRefData*)m_refData)
 

-bool wxFont::Create(const wxNativeFontInfo&)
+bool wxFont::Create(const wxNativeFontInfo& nativeFontInfo)

 {
 {

-    return false;
+    UnRef();
+    m_refData = new wxFontRefData(nativeFontInfo);
+    
+    return true;

 }
 
 void wxFont::SetEncoding(wxFontEncoding)
 }
 
 void wxFont::SetEncoding(wxFontEncoding)


@@ -55,50 +114,46 @@ wxFontEncoding wxFont::GetEncoding() const
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

-    return 0;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    return M_FONTDATA->m_info.pointSize;

 }
 
 bool wxFont::GetUnderlined() const
 {
     if(M_FONTDATA)
 }
 
 bool wxFont::GetUnderlined() const
 {
     if(M_FONTDATA)

-        return M_FONTDATA->m_underlined;
+        return M_FONTDATA->m_info.underlined;

     else
         return false;
 }
 
 int wxFont::GetStyle() const
 {
     else
         return false;
 }
 
 int wxFont::GetStyle() const
 {

-    return 0;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    return M_FONTDATA->m_info.style;

 }
 
 int wxFont::GetFamily() const
 {
 }
 
 int wxFont::GetFamily() const
 {

-    return 0;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    return M_FONTDATA->m_info.family;

 }
 
 int wxFont::GetWeight() const
 {
 }
 
 int wxFont::GetWeight() const
 {

-    return 0;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    return M_FONTDATA->m_info.weight;

 }
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 }
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {

-    return NULL;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    return &M_FONTDATA->m_info;

 }
 
 }
 

-void wxGetNativeFontEncoding(wxFontEncoding, wxNativeEncodingInfo*);
-

 bool wxFont::Create(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding)
 {
     UnRef();
 bool wxFont::Create(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding)
 {
     UnRef();

-    m_refData = new wxFontRefData;
-
-    M_FONTDATA->m_family = family;
-    M_FONTDATA->m_style = style;
-    M_FONTDATA->m_weight = weight;
-    M_FONTDATA->m_pointSize = pointSize;
-    M_FONTDATA->m_underlined = underlined;
-    M_FONTDATA->m_faceName = faceName;
+    m_refData = new wxFontRefData(pointSize, family, style, weight, underlined, faceName, encoding);

 
     RealizeResource();
 
 
     RealizeResource();
 


@@ -134,7 +189,7 @@ void wxFont::SetPointSize(int pointSize)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_pointSize = pointSize;
+    M_FONTDATA->m_info.pointSize = pointSize;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -143,7 +198,7 @@ void wxFont::SetFamily(int family)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_family = family;
+    M_FONTDATA->m_info.family = static_cast<wxFontFamily>(family);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -152,7 +207,7 @@ void wxFont::SetStyle(int style)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_style = style;
+    M_FONTDATA->m_info.style = static_cast<wxFontStyle>(style);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -161,7 +216,7 @@ void wxFont::SetWeight(int weight)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_weight = weight;
+    M_FONTDATA->m_info.weight = static_cast<wxFontWeight>(weight);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -170,7 +225,7 @@ bool wxFont::SetFaceName(const wxString& faceName)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_faceName = faceName;
+    M_FONTDATA->m_info.faceName = faceName;

 
     RealizeResource();
 
 
     RealizeResource();
 


@@ -181,7 +236,7 @@ void wxFont::SetUnderlined(bool underlined)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_underlined = underlined;
+    M_FONTDATA->m_info.underlined = underlined;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -191,7 +246,7 @@ wxString wxFont::GetFaceName() const
 {
     wxString str;
     if (M_FONTDATA)
 {
     wxString str;
     if (M_FONTDATA)

-        str = M_FONTDATA->m_faceName ;
+        str = M_FONTDATA->m_info.faceName;

     return str;
 }
 
     return str;
 }