projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix compilation without wxUSE_STREAMS (closes #10900)
[wxWidgets.git] / src / os2 / font.cpp
diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index ff695a16d02bb1d4c6d78afad5d4c705e54cfd61..ca09caefc38dacfb321eaf1be87a510efeff05af 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.cpp
+// Name:        src/os2/font.cpp
 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:
@@ -20,13 +20,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/font.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
 #ifndef WX_PRECOMP
     #include <stdio.h>
-    #include "wx/setup.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/font.h"
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
@@ -51,14 +51,14 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 public:
     wxFontRefData()
     {
 public:
     wxFontRefData()
     {
-        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE,
+        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,
              wxEmptyString, wxFONTENCODING_DEFAULT);
     }
 
     wxFontRefData( int             nSize
              wxEmptyString, wxFONTENCODING_DEFAULT);
     }
 
     wxFontRefData( int             nSize
-                  ,int             nFamily
-                  ,int             nStyle
-                  ,int             nWeight
+                  ,wxFontFamily    nFamily
+                  ,wxFontStyle     nStyle
+                  ,wxFontWeight    nWeight
                   ,bool            bUnderlined
                   ,const wxString& sFaceName
                   ,wxFontEncoding  vEncoding
                   ,bool            bUnderlined
                   ,const wxString& sFaceName
                   ,wxFontEncoding  vEncoding
@@ -120,18 +120,18 @@ public:
         return m_nPointSize;
     }
 
         return m_nPointSize;
     }
 
-    inline int GetFamily(void) const
+    inline wxFontFamily GetFamily(void) const
     {
         return m_nFamily;
     }
 
     {
         return m_nFamily;
     }
 
-    inline int GetStyle(void) const
+    inline wxFontStyle GetStyle(void) const
     {
         return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
                                    : m_nStyle;
     }
 
     {
         return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
                                    : m_nStyle;
     }
 
-    inline int GetWeight(void) const
+    inline wxFontWeight GetWeight(void) const
     {
         return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
                                    : m_nWeight;
     {
         return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
                                    : m_nWeight;
@@ -175,33 +175,34 @@ public:
             m_nPointSize = nPointSize;
     }
 
             m_nPointSize = nPointSize;
     }
 
-    inline void SetFamily(int nFamily)
+    inline void SetFamily(wxFontFamily nFamily)
     {
         m_nFamily = nFamily;
     }
 
     {
         m_nFamily = nFamily;
     }
 
-    inline void SetStyle(int nStyle)
+    inline void SetStyle(wxFontStyle nStyle)
     {
         if (m_bNativeFontInfoOk)
     {
         if (m_bNativeFontInfoOk)
-            m_vNativeFontInfo.SetStyle((wxFontStyle)nStyle);
+            m_vNativeFontInfo.SetStyle(nStyle);
         else
             m_nStyle = nStyle;
     }
 
         else
             m_nStyle = nStyle;
     }
 
-    inline void SetWeight(int nWeight)
+    inline void SetWeight(wxFontWeight nWeight)
     {
         if (m_bNativeFontInfoOk)
     {
         if (m_bNativeFontInfoOk)
-            m_vNativeFontInfo.SetWeight((wxFontWeight)nWeight);
+            m_vNativeFontInfo.SetWeight(nWeight);
         else
             m_nWeight = nWeight;
     }
 
         else
             m_nWeight = nWeight;
     }
 
-    inline void SetFaceName(const wxString& sFaceName)
+    inline bool SetFaceName(const wxString& sFaceName)
     {
         if (m_bNativeFontInfoOk)
     {
         if (m_bNativeFontInfoOk)
-            m_vNativeFontInfo.SetFaceName(sFaceName);
+            return m_vNativeFontInfo.SetFaceName(sFaceName);
         else
             m_sFaceName = sFaceName;
         else
             m_sFaceName = sFaceName;
+        return true;
     }
 
     inline void SetUnderlined(bool bUnderlined)
     }
 
     inline void SetUnderlined(bool bUnderlined)
@@ -248,9 +249,9 @@ protected:
     // Common part of all ctors
     //
     void Init( int             nSize
     // Common part of all ctors
     //
     void Init( int             nSize
-              ,int             nFamily
-              ,int             nStyle
-              ,int             nWeight
+              ,wxFontFamily    nFamily
+              ,wxFontStyle     nStyle
+              ,wxFontWeight    nWeight
               ,bool            bUnderlined
               ,const wxString& rsFaceName
               ,wxFontEncoding  vEncoding
               ,bool            bUnderlined
               ,const wxString& rsFaceName
               ,wxFontEncoding  vEncoding
@@ -271,9 +272,9 @@ protected:
     // Font characterstics
     //
     int                             m_nPointSize;
     // Font characterstics
     //
     int                             m_nPointSize;
-    int                             m_nFamily;
-    int                             m_nStyle;
-    int                             m_nWeight;
+    wxFontFamily                    m_nFamily;
+    wxFontStyle                     m_nStyle;
+    wxFontWeight                    m_nWeight;
     bool                            m_bUnderlined;
     wxString                        m_sFaceName;
     wxFontEncoding                  m_vEncoding;
     bool                            m_bUnderlined;
     wxString                        m_sFaceName;
     wxFontEncoding                  m_vEncoding;
@@ -296,6 +297,8 @@ protected:
     bool                            m_bInternalPS; // Internally generated PS?
 }; // end of CLASS wxFontRefData
 
     bool                            m_bInternalPS; // Internally generated PS?
 }; // end of CLASS wxFontRefData
 
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================
@@ -306,9 +309,9 @@ protected:
 
 void wxFontRefData::Init(
   int                               nPointSize
 
 void wxFontRefData::Init(
   int                               nPointSize
-, int                               nFamily
-, int                               nStyle
-, int                               nWeight
+, wxFontFamily                      nFamily
+, wxFontStyle                       nStyle
+, wxFontWeight                      nWeight
 , bool                              bUnderlined
 , const wxString&                   rsFaceName
 , wxFontEncoding                    vEncoding
 , bool                              bUnderlined
 , const wxString&                   rsFaceName
 , wxFontEncoding                    vEncoding
@@ -324,10 +327,10 @@ void wxFontRefData::Init(
     m_vEncoding   = vEncoding;
     m_hFont       = 0;
 
     m_vEncoding   = vEncoding;
     m_hFont       = 0;
 
-    m_bNativeFontInfoOk = FALSE;
+    m_bNativeFontInfoOk = false;
 
     m_nFontId     = 0;
 
     m_nFontId     = 0;
-    m_bTemporary  = FALSE;
+    m_bTemporary  = false;
     m_pFM         = (PFONTMETRICS)NULL;
     m_hPS         = NULLHANDLE;
     m_nNumFonts   = 0;
     m_pFM         = (PFONTMETRICS)NULL;
     m_hPS         = NULLHANDLE;
     m_nNumFonts   = 0;
@@ -360,7 +363,7 @@ void wxFontRefData::Init(
         m_hPS = (HPS)hPS;
 
     m_nFontId     = 0;
         m_hPS = (HPS)hPS;
 
     m_nFontId     = 0;
-    m_bTemporary  = FALSE;
+    m_bTemporary  = false;
     m_pFM         = (PFONTMETRICS)NULL;
     m_nNumFonts   = 0;
 } // end of wxFontRefData::Init
     m_pFM         = (PFONTMETRICS)NULL;
     m_nNumFonts   = 0;
 } // end of wxFontRefData::Init
@@ -431,37 +434,37 @@ bool wxFontRefData::Alloc( wxFont* pFont )
     // and face name.
     //
     if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)
     // and face name.
     //
     if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)
-        m_nFamily = wxROMAN;
+        m_nFamily = wxFONTFAMILY_ROMAN;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)
-        m_nFamily = wxROMAN;
+        m_nFamily = wxFONTFAMILY_ROMAN;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
-        m_nFamily = wxROMAN;
+        m_nFamily = wxFONTFAMILY_ROMAN;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
-        m_nFamily = wxROMAN;
+        m_nFamily = wxFONTFAMILY_ROMAN;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
-        m_nFamily = wxDECORATIVE;
+        m_nFamily = wxFONTFAMILY_DECORATIVE;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)
-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)
-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)
-        m_nFamily = wxSCRIPT;
+        m_nFamily = wxFONTFAMILY_SCRIPT;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
-        m_nFamily = wxTELETYPE;
+        m_nFamily = wxFONTFAMILY_TELETYPE;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)
-        m_nFamily = wxTELETYPE;
+        m_nFamily = wxFONTFAMILY_TELETYPE;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
-        m_nFamily = wxTELETYPE;
+        m_nFamily = wxFONTFAMILY_TELETYPE;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
-        m_nFamily = wxMODERN;
+        m_nFamily = wxFONTFAMILY_MODERN;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
-        m_nFamily = wxMODERN;
+        m_nFamily = wxFONTFAMILY_MODERN;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
     else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;
     else
     else
-        m_nFamily = wxSWISS;
+        m_nFamily = wxFONTFAMILY_SWISS;
 
     if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC)
         m_nStyle = wxFONTSTYLE_ITALIC;
 
     if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC)
         m_nStyle = wxFONTSTYLE_ITALIC;
@@ -592,37 +595,37 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
     // Extract family from facename
     //
     if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
     // Extract family from facename
     //
     if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
-        nFamily = wxROMAN;
+        nFamily = wxFONTFAMILY_ROMAN;
     else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)
     else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)
-        nFamily = wxROMAN;
+        nFamily = wxFONTFAMILY_ROMAN;
     else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
     else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
-        nFamily = wxROMAN;
+        nFamily = wxFONTFAMILY_ROMAN;
     else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
     else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
-        nFamily = wxROMAN;
+        nFamily = wxFONTFAMILY_ROMAN;
     else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
     else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
-        nFamily = wxDECORATIVE;
+        nFamily = wxFONTFAMILY_DECORATIVE;
     else if (strcmp(fm.szFamilyname, "Helvetica") == 0)
     else if (strcmp(fm.szFamilyname, "Helvetica") == 0)
-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;
     else if (strcmp(fm.szFamilyname, "Helv") == 0)
     else if (strcmp(fm.szFamilyname, "Helv") == 0)
-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;
     else if (strcmp(fm.szFamilyname, "Script") == 0)
     else if (strcmp(fm.szFamilyname, "Script") == 0)
-        nFamily = wxSCRIPT;
+        nFamily = wxFONTFAMILY_SCRIPT;
     else if (strcmp(fm.szFamilyname, "Courier New") == 0)
     else if (strcmp(fm.szFamilyname, "Courier New") == 0)
-        nFamily = wxTELETYPE;
+        nFamily = wxFONTFAMILY_TELETYPE;
     else if (strcmp(fm.szFamilyname, "Courier") == 0)
     else if (strcmp(fm.szFamilyname, "Courier") == 0)
-        nFamily = wxTELETYPE;
+        nFamily = wxFONTFAMILY_TELETYPE;
     else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
     else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
-        nFamily = wxTELETYPE;
+        nFamily = wxFONTFAMILY_TELETYPE;
     else if (strcmp(fm.szFamilyname, "System VIO") == 0)
     else if (strcmp(fm.szFamilyname, "System VIO") == 0)
-        nFamily = wxMODERN;
+        nFamily = wxFONTFAMILY_MODERN;
     else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
     else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
-        nFamily = wxMODERN;
+        nFamily = wxFONTFAMILY_MODERN;
     else if (strcmp(fm.szFamilyname, "Arial") == 0)
     else if (strcmp(fm.szFamilyname, "Arial") == 0)
-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;
     else if (strcmp(fm.szFamilyname, "Swiss") == 0)
     else if (strcmp(fm.szFamilyname, "Swiss") == 0)
-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;
     else
     else
-        nFamily = wxSWISS;
+        nFamily = wxFONTFAMILY_SWISS;
     return (wxFontFamily)nFamily;
 } // end of wxNativeFontInfo::GetFamily
 
     return (wxFontFamily)nFamily;
 } // end of wxNativeFontInfo::GetFamily
 
@@ -690,11 +693,12 @@ void wxNativeFontInfo::SetUnderlined(
         fa.fsSelection |= FATTR_SEL_UNDERSCORE;
 } // end of wxNativeFontInfo::SetUnderlined
 
         fa.fsSelection |= FATTR_SEL_UNDERSCORE;
 } // end of wxNativeFontInfo::SetUnderlined
 
-void wxNativeFontInfo::SetFaceName(
+bool wxNativeFontInfo::SetFaceName(
   const wxString&                   sFacename
 )
 {
   const wxString&                   sFacename
 )
 {
-    wxStrncpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+    wxStrlcpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+    return true;
 } // end of wxNativeFontInfo::SetFaceName
 
 void wxNativeFontInfo::SetFamily(
 } // end of wxNativeFontInfo::SetFaceName
 
 void wxNativeFontInfo::SetFamily(
@@ -705,31 +709,31 @@ void wxNativeFontInfo::SetFamily(
 
     switch (eFamily)
     {
 
     switch (eFamily)
     {
-        case wxSCRIPT:
+        case wxFONTFAMILY_SCRIPT:
             sFacename = wxT("Tms Rmn");
             break;
 
             sFacename = wxT("Tms Rmn");
             break;
 
-        case wxDECORATIVE:
+        case wxFONTFAMILY_DECORATIVE:
             sFacename = wxT("WarpSans");
             break;
 
             sFacename = wxT("WarpSans");
             break;
 
-        case wxROMAN:
+        case wxFONTFAMILY_ROMAN:
             sFacename = wxT("Tms Rmn");
             break;
 
             sFacename = wxT("Tms Rmn");
             break;
 
-        case wxTELETYPE:
+        case wxFONTFAMILY_TELETYPE:
             sFacename = wxT("Courier") ;
             break;
 
             sFacename = wxT("Courier") ;
             break;
 
-        case wxMODERN:
+        case wxFONTFAMILY_MODERN:
             sFacename = wxT("System VIO") ;
             break;
 
             sFacename = wxT("System VIO") ;
             break;
 
-        case wxSWISS:
+        case wxFONTFAMILY_SWISS:
             sFacename = wxT("Helv") ;
             break;
 
             sFacename = wxT("Helv") ;
             break;
 
-        case wxDEFAULT:
+        case wxFONTFAMILY_DEFAULT:
         default:
             sFacename = wxT("System VIO") ;
     }
         default:
             sFacename = wxT("System VIO") ;
     }
@@ -783,56 +787,56 @@ bool wxNativeFontInfo::FromString( const wxString& rsStr )
     wxString                        sToken = vTokenizer.GetNextToken();
 
     if (sToken != _T('0'))
     wxString                        sToken = vTokenizer.GetNextToken();
 
     if (sToken != _T('0'))
-        return FALSE;
+        return false;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fm.lEmHeight = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fm.lEmHeight = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fa.lAveCharWidth = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.lAveCharWidth = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fa.fsSelection = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsSelection = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fa.fsType = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsType = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fa.fsFontUse = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.fsFontUse = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fa.idRegistry = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.idRegistry = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fa.usCodePage = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.usCodePage = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fa.lMatch = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
     fa.lMatch = lVal;
 
     sToken = vTokenizer.GetNextToken();
     if (!sToken.ToLong(&lVal))
-        return FALSE;
+        return false;
     fn.usWeightClass = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if(!sToken)
     fn.usWeightClass = (USHORT)lVal;
 
     sToken = vTokenizer.GetNextToken();
     if(!sToken)
-        return FALSE;
+        return false;
     wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
     return true;
 } // end of wxNativeFontInfo::FromString
     wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
     return true;
 } // end of wxNativeFontInfo::FromString
@@ -853,7 +857,7 @@ wxString wxNativeFontInfo::ToString() const
                 fa.usCodePage,
                 fa.lMatch,
                 fn.usWeightClass,
                 fa.usCodePage,
                 fa.lMatch,
                 fn.usWeightClass,
-                fa.szFacename);
+                (char *)fa.szFacename);
     return sStr;
 } // end of wxNativeFontInfo::ToString
 
     return sStr;
 } // end of wxNativeFontInfo::ToString
 
@@ -861,10 +865,6 @@ wxString wxNativeFontInfo::ToString() const
 // wxFont
 // ----------------------------------------------------------------------------
 
 // wxFont
 // ----------------------------------------------------------------------------
 
-void wxFont::Init()
-{
-} // end of wxFont::Init
-
 bool wxFont::Create( const wxNativeFontInfo& rInfo,
                      WXHFONT hFont )
 {
 bool wxFont::Create( const wxNativeFontInfo& rInfo,
                      WXHFONT hFont )
 {
@@ -891,9 +891,9 @@ wxFont::wxFont(
 // in wxDC::SetFont, when information is available about scaling etc.
 // ----------------------------------------------------------------------------
 bool wxFont::Create( int             nPointSize,
 // in wxDC::SetFont, when information is available about scaling etc.
 // ----------------------------------------------------------------------------
 bool wxFont::Create( int             nPointSize,
-                     int             nFamily,
-                     int             nStyle,
-                     int             nWeight,
+                     wxFontFamily nFamily,
+                     wxFontStyle nStyle,
+                     wxFontWeight nWeight,
                      bool            bUnderlined,
                      const wxString& rsFaceName,
                      wxFontEncoding  vEncoding )
                      bool            bUnderlined,
                      const wxString& rsFaceName,
                      wxFontEncoding  vEncoding )
@@ -931,6 +931,16 @@ wxFont::~wxFont()
 //   here, but we may check that font definition is true
 // ----------------------------------------------------------------------------
 
 //   here, but we may check that font definition is true
 // ----------------------------------------------------------------------------
 
+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+    return new wxFontRefData();
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
+}
+
 bool wxFont::RealizeResource()
 {
     if ( GetResourceHandle() )
 bool wxFont::RealizeResource()
 {
     if ( GetResourceHandle() )
@@ -950,7 +960,7 @@ bool wxFont::FreeResource( bool WXUNUSED(bForce) )
     return false;
 } // end of wxFont::FreeResource
 
     return false;
 } // end of wxFont::FreeResource
 
-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle() const
 {
     return GetHFONT();
 } // end of wxFont::GetResourceHandle
 {
     return GetHFONT();
 } // end of wxFont::GetResourceHandle
@@ -965,21 +975,6 @@ bool wxFont::IsFree() const
     return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0);
 } // end of wxFont::IsFree
 
     return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0);
 } // end of wxFont::IsFree
 
-void wxFont::Unshare()
-{
-    // Don't change shared data
-    if ( !m_refData )
-    {
-        m_refData = new wxFontRefData();
-    }
-    else
-    {
-        wxFontRefData* ref = new wxFontRefData(*M_FONTDATA);
-        UnRef();
-        m_refData = ref;
-    }
-} // end of wxFont::Unshare
-
 // ----------------------------------------------------------------------------
 // change font attribute: we recreate font when doing it
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // change font attribute: we recreate font when doing it
 // ----------------------------------------------------------------------------
@@ -988,7 +983,7 @@ void wxFont::SetPointSize(
   int                               nPointSize
 )
 {
   int                               nPointSize
 )
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->SetPointSize(nPointSize);
 
 
     M_FONTDATA->SetPointSize(nPointSize);
 
@@ -996,10 +991,10 @@ void wxFont::SetPointSize(
 } // end of wxFont::SetPointSize
 
 void wxFont::SetFamily(
 } // end of wxFont::SetPointSize
 
 void wxFont::SetFamily(
-  int                               nFamily
+  wxFontFamily                      nFamily
 )
 {
 )
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->SetFamily(nFamily);
 
 
     M_FONTDATA->SetFamily(nFamily);
 
@@ -1007,10 +1002,10 @@ void wxFont::SetFamily(
 } // end of wxFont::SetFamily
 
 void wxFont::SetStyle(
 } // end of wxFont::SetFamily
 
 void wxFont::SetStyle(
-  int                               nStyle
+  wxFontStyle                       nStyle
 )
 {
 )
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->SetStyle(nStyle);
 
 
     M_FONTDATA->SetStyle(nStyle);
 
@@ -1018,32 +1013,34 @@ void wxFont::SetStyle(
 } // end of wxFont::SetStyle
 
 void wxFont::SetWeight(
 } // end of wxFont::SetStyle
 
 void wxFont::SetWeight(
-  int                               nWeight
+  wxFontWeight                      nWeight
 )
 {
 )
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->SetWeight(nWeight);
 
     RealizeResource();
 } // end of wxFont::SetWeight
 
 
     M_FONTDATA->SetWeight(nWeight);
 
     RealizeResource();
 } // end of wxFont::SetWeight
 
-void wxFont::SetFaceName(
+bool wxFont::SetFaceName(
   const wxString&                   rsFaceName
 )
 {
   const wxString&                   rsFaceName
 )
 {
-    Unshare();
+    AllocExclusive();
 
 
-    M_FONTDATA->SetFaceName(rsFaceName);
+    bool refdataok = M_FONTDATA->SetFaceName(rsFaceName);
 
     RealizeResource();
 
     RealizeResource();
+
+    return refdataok && wxFontBase::SetFaceName(rsFaceName);
 } // end of wxFont::SetFaceName
 
 void wxFont::SetUnderlined(
   bool                              bUnderlined
 )
 {
 } // end of wxFont::SetFaceName
 
 void wxFont::SetUnderlined(
   bool                              bUnderlined
 )
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->SetUnderlined(bUnderlined);
 
 
     M_FONTDATA->SetUnderlined(bUnderlined);
 
@@ -1054,7 +1051,7 @@ void wxFont::SetEncoding(
   wxFontEncoding                    vEncoding
 )
 {
   wxFontEncoding                    vEncoding
 )
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->SetEncoding(vEncoding);
 
 
     M_FONTDATA->SetEncoding(vEncoding);
 
@@ -1065,7 +1062,7 @@ void wxFont::DoSetNativeFontInfo(
   const wxNativeFontInfo&           rInfo
 )
 {
   const wxNativeFontInfo&           rInfo
 )
 {
-    Unshare();
+    AllocExclusive();
 
     FreeResource();
 
 
     FreeResource();
 
@@ -1085,37 +1082,37 @@ int wxFont::GetPointSize() const
     return M_FONTDATA->GetPointSize();
 } // end of wxFont::GetPointSize
 
     return M_FONTDATA->GetPointSize();
 } // end of wxFont::GetPointSize
 
-int wxFont::GetFamily() const
+wxFontFamily wxFont::GetFamily() const
 {
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
 
     return M_FONTDATA->GetFamily();
 } // end of wxFont::GetFamily
 
 
     return M_FONTDATA->GetFamily();
 } // end of wxFont::GetFamily
 
-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const
 {
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") );
 
     return M_FONTDATA->GetStyle();
 } // end of wxFont::GetStyle
 
 
     return M_FONTDATA->GetStyle();
 } // end of wxFont::GetStyle
 
-int wxFont::GetWeight() const
+wxFontWeight wxFont::GetWeight() const
 {
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") );
 
     return M_FONTDATA->GetWeight();
 }
 
 bool wxFont::GetUnderlined() const
 {
 
     return M_FONTDATA->GetWeight();
 }
 
 bool wxFont::GetUnderlined() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
     return M_FONTDATA->GetUnderlined();
 } // end of wxFont::GetUnderlined
 
 wxString wxFont::GetFaceName() const
 {
 
     return M_FONTDATA->GetUnderlined();
 } // end of wxFont::GetUnderlined
 
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
     return M_FONTDATA->GetFaceName();
 } // end of wxFont::GetFaceName
 
     return M_FONTDATA->GetFaceName();
 } // end of wxFont::GetFaceName
@@ -1136,21 +1133,16 @@ const wxNativeFontInfo* wxFont::GetNativeFontInfo() const
 //
 // Internal use only method to set the FONTMETRICS array
 //
 //
 // Internal use only method to set the FONTMETRICS array
 //
-void wxFont::SetFM(
-  PFONTMETRICS                      pFM
-, int                               nNumFonts
-)
+void wxFont::SetFM( PFONTMETRICS pFM, int nNumFonts )
 {
     M_FONTDATA->SetFM(pFM);
     M_FONTDATA->SetNumFonts(nNumFonts);
 } // end of wxFont::SetFM
 
 
 {
     M_FONTDATA->SetFM(pFM);
     M_FONTDATA->SetNumFonts(nNumFonts);
 } // end of wxFont::SetFM
 
 
-void wxFont::SetPS(
-  HPS                               hPS
-)
+void wxFont::SetPS( HPS hPS )
 {
 {
-    Unshare();
+    AllocExclusive();
 
     M_FONTDATA->SetPS(hPS);
 
 
     M_FONTDATA->SetPS(hPS);
 
wxWidgets (Impactor)