Implement GetValue() and SetValue() and send an event when clicked

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index a2a73706edc3ebbec09d367ef5a995b7fd1cad8f..02cd9c93da0984346f9e7d2529424cca7053f60d 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:       wxWindows licence
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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


@@ -37,20 +37,65 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

+#include "wx/msw/private.h"
+

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

-#include "wx/tokenzr.h"
+#include "wx/fontmap.h"

 
 

-#include "wx/msw/private.h"

 #include "wx/tokenzr.h"
 
 #include "wx/tokenzr.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+#if wxUSE_EXTENDED_RTTI
+
+WX_BEGIN_ENUM( wxFontFamily )
+       WX_ENUM_MEMBER( wxDEFAULT )
+       WX_ENUM_MEMBER( wxDECORATIVE )
+       WX_ENUM_MEMBER( wxROMAN )
+       WX_ENUM_MEMBER( wxSCRIPT )
+       WX_ENUM_MEMBER( wxSWISS )
+       WX_ENUM_MEMBER( wxMODERN )
+       WX_ENUM_MEMBER( wxTELETYPE )
+WX_END_ENUM( wxFontFamily )
+
+WX_BEGIN_ENUM( wxFontStyle )
+       WX_ENUM_MEMBER( wxNORMAL )
+       WX_ENUM_MEMBER( wxITALIC )
+       WX_ENUM_MEMBER( wxSLANT )
+WX_END_ENUM( wxFontStyle )
+
+WX_BEGIN_ENUM( wxFontWeight )
+       WX_ENUM_MEMBER( wxNORMAL )
+       WX_ENUM_MEMBER( wxLIGHT )
+       WX_ENUM_MEMBER( wxBOLD )
+WX_END_ENUM( wxFontWeight )
+
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxFont)
+       WX_PROPERTY( Size,int, SetPointSize, GetPointSize, 12 )
+       WX_PROPERTY( Family, int  , SetFamily, GetFamily, (int)wxDEFAULT ) // wxFontFamily
+       WX_PROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL ) // wxFontStyle
+       WX_PROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL ) // wxFontWeight
+       WX_PROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false )
+       WX_PROPERTY( Face, wxString , SetFaceName, GetFaceName, )
+       WX_PROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT )
+WX_END_PROPERTIES_TABLE()
+
+WX_CONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face )  
+
+WX_BEGIN_HANDLERS_TABLE(wxFont)
+WX_END_HANDLERS_TABLE()
+
+#else
+       IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+#endif
+

 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 

-// the default font size in points
-static const int wxDEFAULT_FONT_SIZE = 12;
+// the mask used to extract the pitch from LOGFONT::lfPitchAndFamily field
+static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH;

 
 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font
 
 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font


@@ -58,21 +103,12 @@ static const int wxDEFAULT_FONT_SIZE = 12;
 
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 {

-friend class WXDLLEXPORT wxFont;
-

 public:
 public:

+    // constructors

     wxFontRefData()
     {
     wxFontRefData()
     {

-        Init(wxDEFAULT_FONT_SIZE, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
-             "", wxFONTENCODING_DEFAULT);
-    }
-
-    wxFontRefData(const wxFontRefData& data)
-    {
-        Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
-             data.m_underlined, data.m_faceName, data.m_encoding);
-
-        m_fontId = data.m_fontId;
+        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
+             FALSE, wxEmptyString, wxFONTENCODING_DEFAULT);

     }
 
     wxFontRefData(int size,
     }
 
     wxFontRefData(int size,


@@ -86,13 +122,140 @@ public:
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
 
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
 

-    wxFontRefData(const wxNativeFontInfo& info)
+    wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+    {
+        Init(info, hFont);
+    }
+
+    wxFontRefData(const wxFontRefData& data)

     {
     {

-        Init(info);
+        if ( data.m_nativeFontInfoOk )
+        {
+            Init(data.m_nativeFontInfo);
+        }
+        else
+        {
+            Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
+                 data.m_underlined, data.m_faceName, data.m_encoding);
+        }

     }
 
     virtual ~wxFontRefData();
 
     }
 
     virtual ~wxFontRefData();
 

+    // operations
+    bool Alloc(wxFont *font);
+
+    void Free();
+
+    // all wxFont accessors
+    int GetPointSize() const
+    {
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetPointSize()
+                                  : m_pointSize;
+    }
+
+    int GetFamily() const
+    {
+        return m_family;
+    }
+
+    int GetStyle() const
+    {
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetStyle()
+                                  : m_style;
+    }
+
+    int GetWeight() const
+    {
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetWeight()
+                                  : m_weight;
+    }
+
+    bool GetUnderlined() const
+    {
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetUnderlined()
+                                  : m_underlined;
+    }
+
+    wxString GetFaceName() const
+    {
+        wxString s;
+        if ( m_nativeFontInfoOk )
+            s = m_nativeFontInfo.GetFaceName();
+        else
+            s = m_faceName;
+
+        return s;
+    }
+
+    wxFontEncoding GetEncoding() const
+    {
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetEncoding()
+                                  : m_encoding;
+    }
+
+    WXHFONT GetHFONT() const { return m_hFont; }
+
+    // ... and setters
+    void SetPointSize(int pointSize)
+    {
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetPointSize(pointSize);
+        else
+            m_pointSize = pointSize;
+    }
+
+    void SetFamily(int family)
+    {
+        m_family = family;
+    }
+
+    void SetStyle(int style)
+    {
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetStyle((wxFontStyle)style);
+        else
+            m_style = style;
+    }
+
+    void SetWeight(int weight)
+    {
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetWeight((wxFontWeight)weight);
+        else
+            m_weight = weight;
+    }
+
+    void SetFaceName(const wxString& faceName)
+    {
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetFaceName(faceName);
+        else
+            m_faceName = faceName;
+    }
+
+    void SetUnderlined(bool underlined)
+    {
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetUnderlined(underlined);
+        else
+            m_underlined = underlined;
+    }
+
+    void SetEncoding(wxFontEncoding encoding)
+    {
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetEncoding(encoding);
+        else
+            m_encoding = encoding;
+    }
+
+    // native font info tests
+    bool HasNativeFontInfo() const { return m_nativeFontInfoOk; }
+
+    const wxNativeFontInfo& GetNativeFontInfo() const
+        { return m_nativeFontInfo; }
+

 protected:
     // common part of all ctors
     void Init(int size,
 protected:
     // common part of all ctors
     void Init(int size,


@@ -103,13 +266,7 @@ protected:
               const wxString& faceName,
               wxFontEncoding encoding);
 
               const wxString& faceName,
               wxFontEncoding encoding);
 

-    void Init(const wxNativeFontInfo& info);
-
-    // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE
-    // DELETED by destructor
-    bool          m_temporary;
-
-    int           m_fontId;
+    void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0);

 
     // font characterstics
     int           m_pointSize;
 
     // font characterstics
     int           m_pointSize;


@@ -145,7 +302,7 @@ void wxFontRefData::Init(int pointSize,
                          wxFontEncoding encoding)
 {
     m_style = style;
                          wxFontEncoding encoding)
 {
     m_style = style;

-    m_pointSize = pointSize;
+    m_pointSize = pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize;

     m_family = family;
     m_style = style;
     m_weight = weight;
     m_family = family;
     m_style = style;
     m_weight = weight;


@@ -153,104 +310,287 @@ void wxFontRefData::Init(int pointSize,
     m_faceName = faceName;
     m_encoding = encoding;
 
     m_faceName = faceName;
     m_encoding = encoding;
 

-    m_fontId = 0;
-    m_temporary = FALSE;
-

     m_hFont = 0;
 
     m_nativeFontInfoOk = FALSE;
 }
 
     m_hFont = 0;
 
     m_nativeFontInfoOk = FALSE;
 }
 

-void wxFontRefData::Init(const wxNativeFontInfo& info)
+void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)

 {
 {

-    // extract family from pitch-and-family
-    int lfFamily = info.lf.lfPitchAndFamily;
-    if ( lfFamily & FIXED_PITCH )
-        lfFamily -= FIXED_PITCH;
-    if ( lfFamily & VARIABLE_PITCH )
-        lfFamily -= VARIABLE_PITCH;
+    // hFont may be zero, or it be passed in case we really want to
+    // use the exact font created in the underlying system
+    // (for example where we can't guarantee conversion from HFONT
+    // to LOGFONT back to HFONT)
+    m_hFont = hFont;
+
+    m_nativeFontInfoOk = TRUE;
+    m_nativeFontInfo = info;
+    // This is the best we can do since we don't have the
+    // correct information at this point.
+    m_family = wxSWISS;
+}
+
+wxFontRefData::~wxFontRefData()
+{
+    Free();
+}

 
 

-    switch ( lfFamily )
+bool wxFontRefData::Alloc(wxFont *font)
+{
+    if ( !m_nativeFontInfoOk )
+    {
+        wxFillLogFont(&m_nativeFontInfo.lf, font);
+        m_nativeFontInfoOk = TRUE;
+    }
+
+    HFONT hfont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
+    if ( !hfont )
+    {
+        wxLogLastError(wxT("CreateFont"));
+
+        return FALSE;
+    }
+
+    m_hFont = (WXHFONT)hfont;
+
+    return TRUE;
+}
+
+void wxFontRefData::Free()
+{
+    if ( m_hFont )
+    {
+        if ( !::DeleteObject((HFONT) m_hFont) )
+        {
+            wxLogLastError(wxT("DeleteObject(font)"));
+        }
+
+        m_hFont = 0;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxNativeFontInfo
+// ----------------------------------------------------------------------------
+
+void wxNativeFontInfo::Init()
+{
+    wxZeroMemory(lf);
+}
+
+int wxNativeFontInfo::GetPointSize() const
+{
+    // FIXME: using the screen here results in incorrect font size calculation
+    //        for printing!
+    const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+
+    return (int) (((72.0*(double)abs(lf.lfHeight)) / (double) ppInch) + 0.5);
+}
+
+wxFontStyle wxNativeFontInfo::GetStyle() const
+{
+    return lf.lfItalic ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL;
+}
+
+wxFontWeight wxNativeFontInfo::GetWeight() const
+{
+    if ( lf.lfWeight <= 300 )
+        return wxFONTWEIGHT_LIGHT;
+
+    if ( lf.lfWeight >= 600 )
+        return wxFONTWEIGHT_BOLD;
+
+    return wxFONTWEIGHT_NORMAL;
+}
+
+bool wxNativeFontInfo::GetUnderlined() const
+{
+    return lf.lfUnderline != 0;
+}
+
+wxString wxNativeFontInfo::GetFaceName() const
+{
+    return lf.lfFaceName;
+}
+
+wxFontFamily wxNativeFontInfo::GetFamily() const
+{
+    wxFontFamily family;
+
+    // extract family from pitch-and-family
+    switch ( lf.lfPitchAndFamily & ~PITCH_MASK )

     {
         case FF_ROMAN:
     {
         case FF_ROMAN:

-            m_family = wxROMAN;
+            family = wxFONTFAMILY_ROMAN;

             break;
 
             break;
 

+        default:
+            wxFAIL_MSG( _T("unknown LOGFONT::lfFamily value") );
+            // fall through
+

         case FF_SWISS:
         case FF_SWISS:

-            m_family = wxSWISS;
+            family = wxFONTFAMILY_SWISS;

             break;
 
         case FF_SCRIPT:
             break;
 
         case FF_SCRIPT:

-            m_family = wxSCRIPT;
+            family = wxFONTFAMILY_SCRIPT;

             break;
 
         case FF_MODERN:
             break;
 
         case FF_MODERN:

-            m_family = wxMODERN;
+            family = wxFONTFAMILY_MODERN;

             break;
 
         case FF_DECORATIVE:
             break;
 
         case FF_DECORATIVE:

-            m_family = wxDECORATIVE;
+            family = wxFONTFAMILY_DECORATIVE;

             break;
             break;

+    }

 
 

+    return family;
+}
+
+wxFontEncoding wxNativeFontInfo::GetEncoding() const
+{
+    return wxGetFontEncFromCharSet(lf.lfCharSet);
+}
+
+void wxNativeFontInfo::SetPointSize(int pointsize)
+{
+#if wxFONT_SIZE_COMPATIBILITY
+    // Incorrect, but compatible with old wxWindows behaviour
+    lf.lfHeight = (pointSize*ppInch)/72;
+#else // wxFONT_SIZE_COMPATIBILITY
+    // FIXME: using the screen here results in incorrect font size calculation
+    //        for printing!
+    const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+
+    lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);
+#endif // wxFONT_SIZE_COMPATIBILITY/!wxFONT_SIZE_COMPATIBILITY
+}
+
+void wxNativeFontInfo::SetStyle(wxFontStyle style)
+{
+    switch ( style )
+    {

         default:
         default:

-            m_family = wxSWISS;
+            wxFAIL_MSG( _T("unknown font style") );
+            // fall through
+
+        case wxFONTSTYLE_NORMAL:
+            lf.lfItalic = FALSE;
+            break;
+
+        case wxFONTSTYLE_ITALIC:
+        case wxFONTSTYLE_SLANT:
+            lf.lfItalic = TRUE;
+            break;

     }
     }

+}

 
 

-    // weight and style
-    switch ( info.lf.lfWeight )
+void wxNativeFontInfo::SetWeight(wxFontWeight weight)
+{
+    switch ( weight )

     {
     {

-        case FW_LIGHT:
-            m_weight = wxLIGHT;
+        default:
+            wxFAIL_MSG( _T("unknown font weight") );
+            // fall through
+
+        case wxFONTWEIGHT_NORMAL:
+            lf.lfWeight = FW_NORMAL;

             break;
 
             break;
 

-        default:
-        case FW_NORMAL:
-            m_weight = wxNORMAL;
+        case wxFONTWEIGHT_LIGHT:
+            lf.lfWeight = FW_LIGHT;

             break;
 
             break;
 

-        case FW_BOLD:
-            m_weight = wxBOLD;
+        case wxFONTWEIGHT_BOLD:
+            lf.lfWeight = FW_BOLD;

             break;
     }
             break;
     }

+}

 
 

-    m_style = info.lf.lfItalic ? wxITALIC : wxNORMAL;
+void wxNativeFontInfo::SetUnderlined(bool underlined)
+{
+    lf.lfUnderline = underlined;
+}
+
+void wxNativeFontInfo::SetFaceName(wxString facename)
+{
+    wxStrncpy(lf.lfFaceName, facename, WXSIZEOF(lf.lfFaceName));
+}

 
 

-    m_underlined = info.lf.lfUnderline != 0;
+void wxNativeFontInfo::SetFamily(wxFontFamily family)
+{
+    int ff_family;
+    wxString facename;

 
 

-    m_faceName = info.lf.lfFaceName;
+    switch ( family )
+    {
+        case wxSCRIPT:
+            ff_family = FF_SCRIPT;
+            facename = _T("Script");
+            break;

 
 

-    int height = abs(info.lf.lfHeight);
+        case wxDECORATIVE:
+            ff_family = FF_DECORATIVE;
+            facename = _T("Old English Text MT");
+            break;

 
 

-    // remember that 1pt = 1/72inch
-    const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
-    m_pointSize = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
+        case wxROMAN:
+            ff_family = FF_ROMAN;
+            facename = _T("Times New Roman");
+            break;

 
 

-    m_encoding = wxGetFontEncFromCharSet(info.lf.lfCharSet);
+        case wxTELETYPE:
+        case wxMODERN:
+            ff_family = FF_MODERN;
+            facename = _T("Courier New");
+            break;

 
 

-    m_fontId = 0;
-    m_temporary = FALSE;
+        case wxSWISS:
+            ff_family = FF_SWISS;
+            facename = _T("Arial");
+            break;

 
 

-    m_hFont = 0;
+        case wxDEFAULT:
+        default:
+            ff_family = FF_SWISS;
+            facename = _T("MS Sans Serif");
+    }

 
 

-    m_nativeFontInfoOk = TRUE;
-    m_nativeFontInfo = info;
+    lf.lfPitchAndFamily = DEFAULT_PITCH | ff_family;
+
+    if ( !wxStrlen(lf.lfFaceName) )
+    {
+        SetFaceName(facename);
+    }

 }
 
 }
 

-wxFontRefData::~wxFontRefData()
+void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)

 {
 {

-    if ( m_hFont )
+    wxNativeEncodingInfo info;
+    if ( !wxGetNativeFontEncoding(encoding, &info) )

     {
     {

-        if ( !::DeleteObject((HFONT) m_hFont) )
+#if wxUSE_FONTMAP
+        if ( wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )

         {
         {

-            wxLogLastError(wxT("DeleteObject(font)"));
+            if ( !info.facename.empty() )
+            {
+                // if we have this encoding only in some particular facename, use
+                // the facename - it is better to show the correct characters in a
+                // wrong facename than unreadable text in a correct one
+                SetFaceName(info.facename);
+            }
+        }
+        else
+#endif // wxUSE_FONTMAP
+        {
+            // unsupported encoding, replace with the default
+            info.charset = DEFAULT_CHARSET;

         }
     }
         }
     }

-}

 
 

-
-// ----------------------------------------------------------------------------
-// wxNativeFontInfo
-// ----------------------------------------------------------------------------
+    lf.lfCharSet = info.charset;
+}

 
 bool wxNativeFontInfo::FromString(const wxString& s)
 {
 
 bool wxNativeFontInfo::FromString(const wxString& s)
 {


@@ -258,10 +598,10 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 
     wxStringTokenizer tokenizer(s, _T(";"));
 
 
     wxStringTokenizer tokenizer(s, _T(";"));
 

+    // first the version

     wxString token = tokenizer.GetNextToken();
     wxString token = tokenizer.GetNextToken();

-    //
-    //  Ignore the version for now
-    //
+    if ( token != _T('0') )
+        return FALSE;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )


@@ -340,7 +680,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
 
 {
     wxString s;
 

-    s.Printf(_T("%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+    s.Printf(_T("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"),

              0, // version, in case we want to change the format later
              lf.lfHeight,
              lf.lfWidth,
              0, // version, in case we want to change the format later
              lf.lfHeight,
              lf.lfWidth,


@@ -366,15 +706,13 @@ wxString wxNativeFontInfo::ToString() const
 
 void wxFont::Init()
 {
 
 void wxFont::Init()
 {

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

 }
 
 }
 

-bool wxFont::Create(const wxNativeFontInfo& info)
+bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)

 {
     UnRef();
 
 {
     UnRef();
 

-    m_refData = new wxFontRefData(info);
+    m_refData = new wxFontRefData(info, hFont);

 
     RealizeResource();
 
 
     RealizeResource();
 


@@ -404,7 +742,9 @@ bool wxFont::Create(int pointSize,
     // wxDEFAULT is a valid value for the font size too so we must treat it
     // specially here (otherwise the size would be 70 == wxDEFAULT value)
     if ( pointSize == wxDEFAULT )
     // wxDEFAULT is a valid value for the font size too so we must treat it
     // specially here (otherwise the size would be 70 == wxDEFAULT value)
     if ( pointSize == wxDEFAULT )

-        pointSize = wxDEFAULT_FONT_SIZE;
+    {
+        pointSize = wxNORMAL_FONT->GetPointSize();
+    }

 
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);
 
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);


@@ -416,8 +756,6 @@ bool wxFont::Create(int pointSize,
 
 wxFont::~wxFont()
 {
 
 wxFont::~wxFont()
 {

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

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


@@ -433,56 +771,34 @@ bool wxFont::RealizeResource()
         return TRUE;
     }
 
         return TRUE;
     }
 

-    if(!M_FONTDATA->m_nativeFontInfoOk)
-    {
-      wxFillLogFont(&M_FONTDATA->m_nativeFontInfo.lf, this);
-      M_FONTDATA->m_nativeFontInfoOk = TRUE;
-    }
-
-    M_FONTDATA->m_hFont = (WXHFONT)::CreateFontIndirect(&M_FONTDATA->m_nativeFontInfo.lf);
-    M_FONTDATA->m_faceName = M_FONTDATA->m_nativeFontInfo.lf.lfFaceName;
-    if ( !M_FONTDATA->m_hFont )
-    {
-        wxLogLastError(wxT("CreateFont"));
-
-        return FALSE;
-    }
-
-    return TRUE;
+    return M_FONTDATA->Alloc(this);

 }
 
 bool wxFont::FreeResource(bool WXUNUSED(force))
 {
     if ( GetResourceHandle() )
     {
 }
 
 bool wxFont::FreeResource(bool WXUNUSED(force))
 {
     if ( GetResourceHandle() )
     {

-        if ( !::DeleteObject((HFONT) M_FONTDATA->m_hFont) )
-        {
-            wxLogLastError(wxT("DeleteObject(font)"));
-        }
-
-        M_FONTDATA->m_hFont = 0;
+        M_FONTDATA->Free();

 
         return TRUE;
     }
 
         return TRUE;
     }

+

     return FALSE;
 }
 
     return FALSE;
 }
 

-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle() const

 {
 {

-    return GetHFONT();
+    return (WXHANDLE)GetHFONT();

 }
 
 WXHFONT wxFont::GetHFONT() const
 {
 }
 
 WXHFONT wxFont::GetHFONT() const
 {

-    if ( !M_FONTDATA )
-        return 0;
-    else
-        return (WXHANDLE)M_FONTDATA->m_hFont;
+    return M_FONTDATA ? M_FONTDATA->GetHFONT() : 0;

 }
 
 bool wxFont::IsFree() const
 {
 }
 
 bool wxFont::IsFree() const
 {

-    return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
+    return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0);

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


@@ -508,8 +824,7 @@ void wxFont::SetPointSize(int pointSize)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_pointSize = pointSize;
-    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+    M_FONTDATA->SetPointSize(pointSize);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -518,8 +833,7 @@ void wxFont::SetFamily(int family)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_family = family;
-    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+    M_FONTDATA->SetFamily(family);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -528,8 +842,7 @@ void wxFont::SetStyle(int style)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_style = style;
-    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+    M_FONTDATA->SetStyle(style);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -538,8 +851,7 @@ void wxFont::SetWeight(int weight)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_weight = weight;
-    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+    M_FONTDATA->SetWeight(weight);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -548,8 +860,7 @@ void wxFont::SetFaceName(const wxString& faceName)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_faceName = faceName;
-    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+    M_FONTDATA->SetFaceName(faceName);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -558,8 +869,7 @@ void wxFont::SetUnderlined(bool underlined)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_underlined = underlined;
-    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+    M_FONTDATA->SetUnderlined(underlined);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -568,19 +878,18 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
 {
     Unshare();
 
 {
     Unshare();
 

-    M_FONTDATA->m_encoding = encoding;
-    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+    M_FONTDATA->SetEncoding(encoding);

 
     RealizeResource();
 }
 
 
     RealizeResource();
 }
 

-void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)

 {
     Unshare();
 
     FreeResource();
 
 {
     Unshare();
 
     FreeResource();
 

-    M_FONTDATA->Init(info);
+    *M_FONTDATA = wxFontRefData(info);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -593,167 +902,71 @@ int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_pointSize;
+    return M_FONTDATA->GetPointSize();

 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_family;
-}
-
-int wxFont::GetFontId() const
-{
-    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-
-    return M_FONTDATA->m_fontId;
+    return M_FONTDATA->GetFamily();

 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_style;
+    return M_FONTDATA->GetStyle();

 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 

-    return M_FONTDATA->m_weight;
+    return M_FONTDATA->GetWeight();

 }
 
 bool wxFont::GetUnderlined() const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 
 }
 
 bool wxFont::GetUnderlined() const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 

-    return M_FONTDATA->m_underlined;
+    return M_FONTDATA->GetUnderlined();

 }
 
 wxString wxFont::GetFaceName() const
 {
 }
 
 wxString wxFont::GetFaceName() const
 {

-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );

 
 

-    return M_FONTDATA->m_faceName;
+    return M_FONTDATA->GetFaceName();

 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {
     wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {
     wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 

-    return M_FONTDATA->m_encoding;
+    return M_FONTDATA->GetEncoding();

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxNativeFontInfo
-// ----------------------------------------------------------------------------
-
-bool wxNativeFontInfo::FromString(const wxString& s)
+wxNativeFontInfo *wxFont::GetNativeFontInfo() const

 {
 {

-    long l;
-
-    wxStringTokenizer tokenizer(s, _T(";"));
-
-    wxString token = tokenizer.GetNextToken();
-    //
-    //  Ignore the version for now
-    //
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfHeight = l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfWidth = l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfEscapement = l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfOrientation = l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfWeight = l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfItalic = (BYTE)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfUnderline = (BYTE)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfStrikeOut = (BYTE)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfCharSet = (BYTE)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfOutPrecision = (BYTE)l;
+    if ( M_FONTDATA->HasNativeFontInfo() )
+        return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo());

 
 

-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfClipPrecision = (BYTE)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfQuality = (BYTE)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return FALSE;
-    lf.lfPitchAndFamily = (BYTE)l;
-
-    token = tokenizer.GetNextToken();
-    if(!token)
-        return FALSE;
-    wxStrcpy(lf.lfFaceName, token.c_str());
-
-    return TRUE;
+    return 0;

 }
 
 }
 

-wxString wxNativeFontInfo::ToString() const
+bool wxFont::IsFixedWidth() const

 {
 {

-    wxString s;
+    if ( M_FONTDATA->HasNativeFontInfo() )
+    {
+        // the two low-order bits specify the pitch of the font, the rest is
+        // family
+        BYTE pitch = M_FONTDATA->GetNativeFontInfo().
+                        lf.lfPitchAndFamily & PITCH_MASK;

 
 

-    s.Printf(_T("%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
-             0, // version, in case we want to change the format later
-             lf.lfHeight,
-             lf.lfWidth,
-             lf.lfEscapement,
-             lf.lfOrientation,
-             lf.lfWeight,
-             lf.lfItalic,
-             lf.lfUnderline,
-             lf.lfStrikeOut,
-             lf.lfCharSet,
-             lf.lfOutPrecision,
-             lf.lfClipPrecision,
-             lf.lfQuality,
-             lf.lfPitchAndFamily,
-             lf.lfFaceName);
+        return pitch == FIXED_PITCH;
+    }

 
 

-    return s;
+    return wxFontBase::IsFixedWidth();

 }
 
 }