cvs to svn

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

diff --git a/src/cocoa/font.cpp b/src/cocoa/font.cpp
index dd538c4d8ede6e3ba40674850d63cb0a05e563d1..ed1fac7b70aeb04b2a96244adc158044819d8a5d 100644 (file)
--- a/src/cocoa/font.cpp
+++ b/src/cocoa/font.cpp
@@ -1,30 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.cpp
+// Name:        src/cocoa/font.cpp

 // Purpose:     wxFont class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Purpose:     wxFont class
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

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

-#include "wx/gdicmn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/gdicmn.h"
+#endif
+

 #include "wx/encinfo.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 void wxFontRefData::Init(int size, int family, int style, int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding)
 {
 #include "wx/encinfo.h"
 
 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_family = family;
+    m_style = style;
+    m_weight = weight;
+    m_underlined = underlined;
+    m_faceName = faceName;
+    m_encoding = encoding;

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


@@ -32,13 +37,11 @@ wxFontRefData::~wxFontRefData()
     // TODO: delete font data
 }
 
     // TODO: delete font data
 }
 

-void wxFont::Init()
-{
-}
+#define M_FONTDATA ((wxFontRefData*)m_refData)

 
 bool wxFont::Create(const wxNativeFontInfo&)
 {
 
 bool wxFont::Create(const wxNativeFontInfo&)
 {

-    return FALSE;
+    return false;

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


@@ -57,7 +60,7 @@ int wxFont::GetPointSize() const
 
 bool wxFont::GetUnderlined() const
 {
 
 bool wxFont::GetUnderlined() const
 {

-    return FALSE;
+    return false;

 }
 
 int wxFont::GetStyle() const
 }
 
 int wxFont::GetStyle() const


@@ -96,34 +99,32 @@ bool wxFont::Create(int pointSize, int family, int style, int weight, bool under
 
     RealizeResource();
 
 
     RealizeResource();
 

-    return TRUE;
+    return true;

 }
 
 wxFont::~wxFont()
 {
 }
 
 wxFont::~wxFont()
 {

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

 }
 
 bool wxFont::RealizeResource()
 {
     // TODO: create the font (if there is a native font object)
 }
 
 bool wxFont::RealizeResource()
 {
     // TODO: create the font (if there is a native font object)

-    return FALSE;
+    return false;

 }
 
 void wxFont::Unshare()
 {
 }
 
 void wxFont::Unshare()
 {

-       // Don't change shared data
-       if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)

     {
     {

-               m_refData = new wxFontRefData();
-       }
+        m_refData = new wxFontRefData();
+    }

     else
     {
     else
     {

-               wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-               UnRef();
-               m_refData = ref;
-       }
+        wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }

 }
 
 void wxFont::SetPointSize(int pointSize)
 }
 
 void wxFont::SetPointSize(int pointSize)


@@ -162,13 +163,15 @@ void wxFont::SetWeight(int weight)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
 
     RealizeResource();
 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
 
     RealizeResource();

+
+    return wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)


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

-           str = M_FONTDATA->m_faceName ;
+        str = M_FONTDATA->m_faceName ;

     return str;
 }
 
     return str;
 }