Fixed filename in wxOSX-Cocoa's file dialog using extension of wrong file type.

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index ed8728be509a700253436f4bbfbfd800f3a05f7d..d995db91ac7e54cd9f4fc5851f517a4aa55447f3 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -31,11 +31,10 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"

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

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

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

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


@@ -43,54 +42,9 @@
     #include "wx/sysopt.h"
 #endif
 
     #include "wx/sysopt.h"
 #endif
 

+#include "wx/scopeguard.h"

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

-#if wxUSE_EXTENDED_RTTI
-
-wxBEGIN_ENUM( wxFontFamily )
-    wxENUM_MEMBER( wxDEFAULT )
-    wxENUM_MEMBER( wxDECORATIVE )
-    wxENUM_MEMBER( wxROMAN )
-    wxENUM_MEMBER( wxSCRIPT )
-    wxENUM_MEMBER( wxSWISS )
-    wxENUM_MEMBER( wxMODERN )
-    wxENUM_MEMBER( wxTELETYPE )
-wxEND_ENUM( wxFontFamily )
-
-wxBEGIN_ENUM( wxFontStyle )
-    wxENUM_MEMBER( wxNORMAL )
-    wxENUM_MEMBER( wxITALIC )
-    wxENUM_MEMBER( wxSLANT )
-wxEND_ENUM( wxFontStyle )
-
-wxBEGIN_ENUM( wxFontWeight )
-    wxENUM_MEMBER( wxNORMAL )
-    wxENUM_MEMBER( wxLIGHT )
-    wxENUM_MEMBER( wxBOLD )
-wxEND_ENUM( wxFontWeight )
-
-IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxFont)
-    wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Family, int  , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily
-    wxPROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle
-    wxPROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight
-    wxPROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Face, wxString , SetFaceName, GetFaceName, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxCONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face )
-
-wxBEGIN_HANDLERS_TABLE(wxFont)
-wxEND_HANDLERS_TABLE()
-
-#else
-    IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-#endif
-
-

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


@@ -134,87 +88,77 @@ public:
 
     wxFontRefData(const wxFontRefData& data) : wxGDIRefData()
     {
 
     wxFontRefData(const wxFontRefData& data) : wxGDIRefData()
     {

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

     }
 
     virtual ~wxFontRefData();
 
     // operations
     }
 
     virtual ~wxFontRefData();
 
     // operations

-    bool Alloc(const wxFont *font);
+    bool Alloc();

 
     void Free();
 
     // all wxFont accessors
     int GetPointSize() const
     {
 
     void Free();
 
     // all wxFont accessors
     int GetPointSize() const
     {

-        return m_nativeFontInfoOk ? m_nativeFontInfo.GetPointSize()
-                                  : m_pointSize;
+        return m_nativeFontInfo.GetPointSize();

     }
 
     wxSize GetPixelSize() const
     {
     }
 
     wxSize GetPixelSize() const
     {

-        return m_nativeFontInfoOk ? m_nativeFontInfo.GetPixelSize()
-                                  : m_pixelSize;
+        return m_nativeFontInfo.GetPixelSize();

     }
 
     bool IsUsingSizeInPixels() const
     {
     }
 
     bool IsUsingSizeInPixels() const
     {

-        return m_nativeFontInfoOk ? true : m_sizeUsingPixels;
+        return m_sizeUsingPixels;

     }
 
     wxFontFamily GetFamily() const
     {
     }
 
     wxFontFamily GetFamily() const
     {

-        return m_family;
+        return m_nativeFontInfo.GetFamily();

     }
 
     wxFontStyle GetStyle() const
     {
     }
 
     wxFontStyle GetStyle() const
     {

-        return m_nativeFontInfoOk ? m_nativeFontInfo.GetStyle()
-                                  : m_style;
+        return m_nativeFontInfo.GetStyle();

     }
 
     wxFontWeight GetWeight() const
     {
     }
 
     wxFontWeight GetWeight() const
     {

-        return m_nativeFontInfoOk ? m_nativeFontInfo.GetWeight()
-                                  : m_weight;
+        return m_nativeFontInfo.GetWeight();

     }
 
     bool GetUnderlined() const
     {
     }
 
     bool GetUnderlined() const
     {

-        return m_nativeFontInfoOk ? m_nativeFontInfo.GetUnderlined()
-                                  : m_underlined;
+        return m_nativeFontInfo.GetUnderlined();

     }
 
     wxString GetFaceName() const
     {
     }
 
     wxString GetFaceName() const
     {

-        wxString s;
-        if ( m_nativeFontInfoOk )
-            s = m_nativeFontInfo.GetFaceName();
-        else
-            s = m_faceName;
+        wxString facename = m_nativeFontInfo.GetFaceName();
+        if ( facename.empty() )
+        {
+            facename = GetMSWFaceName();
+            if ( !facename.empty() )
+            {
+                // cache the face name, it shouldn't change unless the family
+                // does and wxNativeFontInfo::SetFamily() resets the face name
+                const_cast<wxFontRefData *>(this)->SetFaceName(facename);
+            }
+        }

 
 

-        return s;
+        return facename;

     }
 
     wxFontEncoding GetEncoding() const
     {
     }
 
     wxFontEncoding GetEncoding() const
     {

-        return m_nativeFontInfoOk ? m_nativeFontInfo.GetEncoding()
-                                  : m_encoding;
+        return m_nativeFontInfo.GetEncoding();

     }
 
     }
 

-    WXHFONT GetHFONT(const wxFont *font) const
+    WXHFONT GetHFONT() const

     {
     {

-        if ( !m_hFont )
-            const_cast<wxFontRefData *>(this)->Alloc(font);
+        AllocIfNeeded();

 
         return (WXHFONT)m_hFont;
     }
 
         return (WXHFONT)m_hFont;
     }


@@ -231,102 +175,82 @@ public:
     {
         Free();
 
     {
         Free();
 

-        if ( m_nativeFontInfoOk )
-        {
-            m_nativeFontInfo.SetPointSize(pointSize);
-        }
-        else
-        {
-            m_pointSize = pointSize;
-            m_sizeUsingPixels = false;
-        }
+        m_nativeFontInfo.SetPointSize(pointSize);
+        m_sizeUsingPixels = false;

     }
 
     void SetPixelSize(const wxSize& pixelSize)
     {
     }
 
     void SetPixelSize(const wxSize& pixelSize)
     {

+        wxCHECK_RET( pixelSize.GetWidth() >= 0, "negative font width" );
+        wxCHECK_RET( pixelSize.GetHeight() != 0, "zero font height" );
+

         Free();
 
         Free();
 

-        if ( m_nativeFontInfoOk )
-        {
-            m_nativeFontInfo.SetPixelSize(pixelSize);
-        }
-        else
-        {
-            m_pixelSize = pixelSize;
-            m_sizeUsingPixels = true;
-        }
+        m_nativeFontInfo.SetPixelSize(pixelSize);
+        m_sizeUsingPixels = true;

     }
 
     void SetFamily(wxFontFamily family)
     {
         Free();
 
     }
 
     void SetFamily(wxFontFamily family)
     {
         Free();
 

-        m_family = family;
+        m_nativeFontInfo.SetFamily(family);

     }
 
     void SetStyle(wxFontStyle style)
     {
         Free();
 
     }
 
     void SetStyle(wxFontStyle style)
     {
         Free();
 

-        if ( m_nativeFontInfoOk )
-            m_nativeFontInfo.SetStyle((wxFontStyle)style);
-        else
-            m_style = style;
+        m_nativeFontInfo.SetStyle(style);

     }
 
     void SetWeight(wxFontWeight weight)
     {
         Free();
 
     }
 
     void SetWeight(wxFontWeight weight)
     {
         Free();
 

-        if ( m_nativeFontInfoOk )
-            m_nativeFontInfo.SetWeight((wxFontWeight)weight);
-        else
-            m_weight = weight;
+        m_nativeFontInfo.SetWeight(weight);

     }
 
     bool SetFaceName(const wxString& faceName)
     {
         Free();
 
     }
 
     bool SetFaceName(const wxString& faceName)
     {
         Free();
 

-        if ( m_nativeFontInfoOk )
-            return m_nativeFontInfo.SetFaceName(faceName);
-
-        m_faceName = faceName;
-        return true;
+        return m_nativeFontInfo.SetFaceName(faceName);

     }
 
     void SetUnderlined(bool underlined)
     {
         Free();
 
     }
 
     void SetUnderlined(bool underlined)
     {
         Free();
 

-        if ( m_nativeFontInfoOk )
-            m_nativeFontInfo.SetUnderlined(underlined);
-        else
-            m_underlined = underlined;
+        m_nativeFontInfo.SetUnderlined(underlined);

     }
 
     void SetEncoding(wxFontEncoding encoding)
     {
         Free();
 
     }
 
     void SetEncoding(wxFontEncoding encoding)
     {
         Free();
 

-        if ( m_nativeFontInfoOk )
-            m_nativeFontInfo.SetEncoding(encoding);
-        else
-            m_encoding = encoding;
+        m_nativeFontInfo.SetEncoding(encoding);

     }
 
     }
 

-    // native font info
-    bool HasNativeFontInfo() const { return m_nativeFontInfoOk; }
-

     const wxNativeFontInfo& GetNativeFontInfo() const
     const wxNativeFontInfo& GetNativeFontInfo() const

-        { return m_nativeFontInfo; }
+    {
+        // we need to create the font now to get the corresponding LOGFONT if
+        // it hadn't been done yet
+        AllocIfNeeded();
+
+        // ensure that we have a valid face name in our font information:
+        // GetFaceName() will try to retrieve it from our HFONT and save it if
+        // it was successful
+        (void)GetFaceName();
+
+        return m_nativeFontInfo;
+    }

 
     void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo)
     {
         Free();
 
         m_nativeFontInfo = nativeFontInfo;
 
     void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo)
     {
         Free();
 
         m_nativeFontInfo = nativeFontInfo;

-        m_nativeFontInfoOk = true;

     }
 
 protected:
     }
 
 protected:


@@ -343,23 +267,56 @@ protected:
 
     void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 
 
     void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 

-    // font characteristics
-    int           m_pointSize;
-    wxSize        m_pixelSize;
-    bool          m_sizeUsingPixels;
-    wxFontFamily  m_family;
-    wxFontStyle   m_style;
-    wxFontWeight  m_weight;
-    bool          m_underlined;
-    wxString      m_faceName;
-    wxFontEncoding m_encoding;
+    void AllocIfNeeded() const
+    {
+        if ( !m_hFont )
+            const_cast<wxFontRefData *>(this)->Alloc();
+    }
+
+    // retrieve the face name really being used by the font: this is used to
+    // get the face name selected by the system when we don't specify it (but
+    // use just the family for example)
+    wxString GetMSWFaceName() const
+    {
+        ScreenHDC hdc;
+        SelectInHDC selectFont(hdc, m_hFont);
+
+        UINT otmSize = GetOutlineTextMetrics(hdc, 0, NULL);
+        if ( !otmSize )
+        {
+            wxLogLastError("GetOutlineTextMetrics(NULL)");
+            return wxString();
+        }
+
+        OUTLINETEXTMETRIC * const
+            otm = static_cast<OUTLINETEXTMETRIC *>(malloc(otmSize));
+        wxON_BLOCK_EXIT1( free, otm );
+
+        otm->otmSize = otmSize;
+        if ( !GetOutlineTextMetrics(hdc, otmSize, otm) )
+        {
+            wxLogLastError("GetOutlineTextMetrics()");
+            return wxString();
+        }
+
+        // in spite of its type, the otmpFamilyName field of OUTLINETEXTMETRIC
+        // gives an offset in _bytes_ of the face (not family!) name from the
+        // struct start while the name itself is an array of TCHARs
+        //
+        // FWIW otmpFaceName contains the same thing as otmpFamilyName followed
+        // by a possible " Italic" or " Bold" or something else suffix
+        return reinterpret_cast<wxChar *>(otm) +
+                    wxPtrToUInt(otm->otmpFamilyName)/sizeof(wxChar);
+    }
+
+    // are we using m_nativeFontInfo.lf.lfHeight for point size or pixel size?
+    bool             m_sizeUsingPixels;

 
     // Windows font handle, created on demand in GetHFONT()
 
     // Windows font handle, created on demand in GetHFONT()

-    HFONT         m_hFont;
+    HFONT            m_hFont;

 
     // Native font info
     wxNativeFontInfo m_nativeFontInfo;
 
     // Native font info
     wxNativeFontInfo m_nativeFontInfo;

-    bool             m_nativeFontInfoOk;

 };
 
 #define M_FONTDATA ((wxFontRefData*)m_refData)
 };
 
 #define M_FONTDATA ((wxFontRefData*)m_refData)


@@ -382,20 +339,26 @@ void wxFontRefData::Init(int pointSize,
                          const wxString& faceName,
                          wxFontEncoding encoding)
 {
                          const wxString& faceName,
                          wxFontEncoding encoding)
 {

-    m_style = style;
-    m_pointSize = pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize;
-    m_pixelSize = pixelSize;
-    m_sizeUsingPixels = sizeUsingPixels;
-    m_family = family;
-    m_style = style;
-    m_weight = weight;
-    m_underlined = underlined;
-    m_faceName = faceName;
-    m_encoding = encoding;
-
-    m_hFont = 0;
+    m_hFont = NULL;

 
 

-    m_nativeFontInfoOk = false;
+    m_sizeUsingPixels = sizeUsingPixels;
+    if ( m_sizeUsingPixels )
+        SetPixelSize(pixelSize);
+    else
+        SetPointSize(pointSize);
+
+    SetStyle(style);
+    SetWeight(weight);
+    SetUnderlined(underlined);
+
+    // set the family/facename
+    SetFamily(family);
+    if ( !faceName.empty() )
+        SetFaceName(faceName);
+
+    // deal with encoding now (it may override the font family and facename
+    // so do it after setting them)
+    SetEncoding(encoding);

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


@@ -405,12 +368,9 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
     // (for example where we can't guarantee conversion from HFONT
     // to LOGFONT back to HFONT)
     m_hFont = (HFONT)hFont;
     // (for example where we can't guarantee conversion from HFONT
     // to LOGFONT back to HFONT)
     m_hFont = (HFONT)hFont;

-
-    m_nativeFontInfoOk = true;

     m_nativeFontInfo = info;
     m_nativeFontInfo = info;

-    // This is the best we can do since we don't have the
-    // correct information at this point.
-    m_family = wxFONTFAMILY_SWISS;
+
+    // TODO: m_sizeUsingPixels?

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


@@ -418,14 +378,8 @@ wxFontRefData::~wxFontRefData()
     Free();
 }
 
     Free();
 }
 

-bool wxFontRefData::Alloc(const wxFont *font)
+bool wxFontRefData::Alloc()

 {
 {

-    if ( !m_nativeFontInfoOk )
-    {
-        wxFillLogFont(&m_nativeFontInfo.lf, font);
-        m_nativeFontInfoOk = true;
-    }
-

     m_hFont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
     if ( !m_hFont )
     {
     m_hFont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
     if ( !m_hFont )
     {


@@ -464,7 +418,7 @@ void wxNativeFontInfo::Init()
 #ifdef __WXWINCE__
     lf.lfQuality = CLEARTYPE_QUALITY;
 #else
 #ifdef __WXWINCE__
     lf.lfQuality = CLEARTYPE_QUALITY;
 #else

-    lf.lfQuality = wxSystemOptions::GetOptionInt(_T("msw.font.no-proof-quality"))
+    lf.lfQuality = wxSystemOptions::GetOptionInt("msw.font.no-proof-quality")

                     ? DEFAULT_QUALITY
                     : PROOF_QUALITY;
 #endif
                     ? DEFAULT_QUALITY
                     : PROOF_QUALITY;
 #endif


@@ -521,14 +475,14 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
     // extract family from pitch-and-family
     switch ( lf.lfPitchAndFamily & ~PITCH_MASK )
     {
     // extract family from pitch-and-family
     switch ( lf.lfPitchAndFamily & ~PITCH_MASK )
     {

+        case 0:
+            family = wxFONTFAMILY_UNKNOWN;
+            break;
+

         case FF_ROMAN:
             family = wxFONTFAMILY_ROMAN;
             break;
 
         case FF_ROMAN:
             family = wxFONTFAMILY_ROMAN;
             break;
 

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

         case FF_SWISS:
             family = wxFONTFAMILY_SWISS;
             break;
         case FF_SWISS:
             family = wxFONTFAMILY_SWISS;
             break;


@@ -544,6 +498,11 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
         case FF_DECORATIVE:
             family = wxFONTFAMILY_DECORATIVE;
             break;
         case FF_DECORATIVE:
             family = wxFONTFAMILY_DECORATIVE;
             break;

+
+        default:
+            wxFAIL_MSG( "unknown LOGFONT::lfFamily value" );
+            family = wxFONTFAMILY_UNKNOWN;
+                // just to avoid a warning

     }
 
     return family;
     }
 
     return family;


@@ -565,17 +524,25 @@ void wxNativeFontInfo::SetPointSize(int pointsize)
 
 void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
 {
 
 void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
 {

-    lf.lfHeight = pixelSize.GetHeight();
+    // MSW accepts both positive and negative heights here but they mean
+    // different things: positive specifies the cell height while negative
+    // specifies the character height. We used to just pass the value to MSW
+    // unchanged but changed the behaviour for positive values in 2.9.1 to
+    // match other ports and, more importantly, the expected behaviour. So now
+    // passing the negative height doesn't make sense at all any more but we
+    // still accept it for compatibility with the existing code which worked
+    // around the wrong interpretation of the height argument in older wxMSW
+    // versions by passing a negative value explicitly itself.
+    lf.lfHeight = -abs(pixelSize.GetHeight());

     lf.lfWidth = pixelSize.GetWidth();
 }
 
     lf.lfWidth = pixelSize.GetWidth();
 }
 

-

 void wxNativeFontInfo::SetStyle(wxFontStyle style)
 {
     switch ( style )
     {
         default:
 void wxNativeFontInfo::SetStyle(wxFontStyle style)
 {
     switch ( style )
     {
         default:

-            wxFAIL_MSG( _T("unknown font style") );
+            wxFAIL_MSG( "unknown font style" );

             // fall through
 
         case wxFONTSTYLE_NORMAL:
             // fall through
 
         case wxFONTSTYLE_NORMAL:


@@ -594,7 +561,7 @@ void wxNativeFontInfo::SetWeight(wxFontWeight weight)
     switch ( weight )
     {
         default:
     switch ( weight )
     {
         default:

-            wxFAIL_MSG( _T("unknown font weight") );
+            wxFAIL_MSG( "unknown font weight" );

             // fall through
 
         case wxFONTWEIGHT_NORMAL:
             // fall through
 
         case wxFONTWEIGHT_NORMAL:


@@ -624,84 +591,44 @@ bool wxNativeFontInfo::SetFaceName(const wxString& facename)
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {

-    BYTE ff_family;
-    wxArrayString facename;
-
-    // the list of fonts associated with a family was partially
-    // taken from http://www.codestyle.org/css/font-family
+    BYTE ff_family = FF_DONTCARE;

 
     switch ( family )
     {
 
     switch ( family )
     {

-        case wxSCRIPT:
+        case wxFONTFAMILY_SCRIPT:

             ff_family = FF_SCRIPT;
             ff_family = FF_SCRIPT;

-            facename.Add(_T("Script"));
-            facename.Add(_T("Brush Script MT"));
-            facename.Add(_T("Comic Sans MS"));
-            facename.Add(_T("Lucida Handwriting"));

             break;
 
             break;
 

-        case wxDECORATIVE:
+        case wxFONTFAMILY_DECORATIVE:

             ff_family = FF_DECORATIVE;
             ff_family = FF_DECORATIVE;

-            facename.Add(_T("Old English Text MT"));
-            facename.Add(_T("Comic Sans MS"));
-            facename.Add(_T("Lucida Handwriting"));

             break;
 
             break;
 

-        case wxROMAN:
+        case wxFONTFAMILY_ROMAN:

             ff_family = FF_ROMAN;
             ff_family = FF_ROMAN;

-            facename.Add(_T("Times New Roman"));
-            facename.Add(_T("Georgia"));
-            facename.Add(_T("Garamond"));
-            facename.Add(_T("Bookman Old Style"));
-            facename.Add(_T("Book Antiqua"));

             break;
 
             break;
 

-        case wxTELETYPE:
-        case wxMODERN:
+        case wxFONTFAMILY_TELETYPE:
+        case wxFONTFAMILY_MODERN:

             ff_family = FF_MODERN;
             ff_family = FF_MODERN;

-            facename.Add(_T("Courier New"));
-            facename.Add(_T("Lucida Console"));
-            facename.Add(_T("Andale Mono"));
-            facename.Add(_T("OCR A Extended"));
-            facename.Add(_T("Terminal"));

             break;
 
             break;
 

-        case wxSWISS:
+        case wxFONTFAMILY_SWISS:
+        case wxFONTFAMILY_DEFAULT:

             ff_family = FF_SWISS;
             ff_family = FF_SWISS;

-            facename.Add(_T("Arial"));
-            facename.Add(_T("Century Gothic"));
-            facename.Add(_T("Lucida Sans Unicode"));
-            facename.Add(_T("Tahoma"));
-            facename.Add(_T("Trebuchet MS"));
-            facename.Add(_T("Verdana"));

             break;
 
             break;
 

-        case wxDEFAULT:
-        default:
-        {
-            // We want Windows 2000 or later to have new fonts even MS Shell Dlg
-            // is returned as default GUI font for compatibility
-            int verMaj;
-            ff_family = FF_SWISS;
-            if(wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
-                facename.Add(_T("MS Shell Dlg 2"));
-            else
-                facename.Add(_T("MS Shell Dlg"));
-
-            // Quoting the MSDN:
-            //     "MS Shell Dlg is a mapping mechanism that enables
-            //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to
-            //     support locales that have characters that are not contained in code
-            //     page 1252. It is not a font but a face name for a nonexistent font."
-        }
+        case wxFONTFAMILY_UNKNOWN:
+            wxFAIL_MSG( "invalid font family" );
+            return;

     }
 
     }
 

+    wxCHECK_RET( ff_family != FF_DONTCARE, "unknown wxFontFamily" );
+

     lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family;
 
     lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family;
 

-    if ( !wxStrlen(lf.lfFaceName) )
-    {
-        SetFaceName(facename);
-    }
+    // reset the facename so that CreateFontIndirect() will automatically choose a
+    // face name based only on the font family.
+    lf.lfFaceName[0] = '\0';

 }
 
 void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
 }
 
 void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)


@@ -735,11 +662,11 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 {
     long l;
 
 {
     long l;
 

-    wxStringTokenizer tokenizer(s, _T(";"));
+    wxStringTokenizer tokenizer(s, wxS(";"), wxTOKEN_RET_EMPTY_ALL);

 
     // first the version
     wxString token = tokenizer.GetNextToken();
 
     // first the version
     wxString token = tokenizer.GetNextToken();

-    if ( token != _T('0') )
+    if ( token != wxS('0') )

         return false;
 
     token = tokenizer.GetNextToken();
         return false;
 
     token = tokenizer.GetNextToken();


@@ -807,10 +734,11 @@ bool wxNativeFontInfo::FromString(const wxString& s)
         return false;
     lf.lfPitchAndFamily = (BYTE)l;
 
         return false;
     lf.lfPitchAndFamily = (BYTE)l;
 

-    token = tokenizer.GetNextToken();
-    if(!token)
+    if ( !tokenizer.HasMoreTokens() )

         return false;
         return false;

-    wxStrcpy(lf.lfFaceName, token.c_str());
+
+    // the face name may be empty
+    SetFaceName(tokenizer.GetNextToken());

 
     return true;
 }
 
     return true;
 }


@@ -819,7 +747,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
 
 {
     wxString s;
 

-    s.Printf(_T("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+    s.Printf(wxS("%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,


@@ -834,7 +762,7 @@ wxString wxNativeFontInfo::ToString() const
              lf.lfClipPrecision,
              lf.lfQuality,
              lf.lfPitchAndFamily,
              lf.lfClipPrecision,
              lf.lfQuality,
              lf.lfPitchAndFamily,

-             (const wxChar*)lf.lfFaceName);
+             lf.lfFaceName);

 
     return s;
 }
 
     return s;
 }


@@ -843,6 +771,13 @@ wxString wxNativeFontInfo::ToString() const
 // wxFont
 // ----------------------------------------------------------------------------
 
 // wxFont
 // ----------------------------------------------------------------------------
 

+wxFont::wxFont(const wxString& fontdesc)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);
+}
+

 bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
 {
     UnRef();
 bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
 {
     UnRef();


@@ -852,13 +787,6 @@ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
     return RealizeResource();
 }
 
     return RealizeResource();
 }
 

-wxFont::wxFont(const wxString& fontdesc)
-{
-    wxNativeFontInfo info;
-    if ( info.FromString(fontdesc) )
-        (void)Create(info);
-}
-

 bool wxFont::DoCreate(int pointSize,
                       const wxSize& pixelSize,
                       bool sizeUsingPixels,
 bool wxFont::DoCreate(int pointSize,
                       const wxSize& pixelSize,
                       bool sizeUsingPixels,


@@ -905,16 +833,15 @@ wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
 
 bool wxFont::RealizeResource()
 {
 
 bool wxFont::RealizeResource()
 {

-    // don't do anything if we already have a valid font
-    if ( GetHFONT() )
-        return true;
-
-    return M_FONTDATA->Alloc(this);
+    // NOTE: the GetHFONT() call automatically triggers a reallocation of
+    //       the HFONT if necessary (will do nothing if we already have the resource);
+    //       it returns NULL only if there is a failure in wxFontRefData::Alloc()...
+    return GetHFONT() != NULL;

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

-    if ( !GetHFONT() )
+    if ( !M_FONTDATA )

         return false;
 
     M_FONTDATA->Free();
         return false;
 
     M_FONTDATA->Free();


@@ -929,7 +856,9 @@ WXHANDLE wxFont::GetResourceHandle() const
 
 WXHFONT wxFont::GetHFONT() const
 {
 
 WXHFONT wxFont::GetHFONT() const
 {

-    return M_FONTDATA ? M_FONTDATA->GetHFONT(this) : 0;
+    // NOTE: wxFontRefData::GetHFONT() will automatically call
+    //       wxFontRefData::Alloc() if necessary
+    return M_FONTDATA ? M_FONTDATA->GetHFONT() : 0;

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


@@ -1021,102 +950,87 @@ void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 
 int wxFont::GetPointSize() const
 {
 
 int wxFont::GetPointSize() const
 {

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

 
     return M_FONTDATA->GetPointSize();
 }
 
 wxSize wxFont::GetPixelSize() const
 {
 
     return M_FONTDATA->GetPointSize();
 }
 
 wxSize wxFont::GetPixelSize() const
 {

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

 
     return M_FONTDATA->GetPixelSize();
 }
 
 bool wxFont::IsUsingSizeInPixels() const
 {
 
     return M_FONTDATA->GetPixelSize();
 }
 
 bool wxFont::IsUsingSizeInPixels() const
 {

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

 
     return M_FONTDATA->IsUsingSizeInPixels();
 }
 
 
     return M_FONTDATA->IsUsingSizeInPixels();
 }
 

-wxFontFamily wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const

 {
 {

-    wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
-

     return M_FONTDATA->GetFamily();
 }
 
 wxFontStyle wxFont::GetStyle() const
 {
     return M_FONTDATA->GetFamily();
 }
 
 wxFontStyle wxFont::GetStyle() const
 {

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

 
     return M_FONTDATA->GetStyle();
 }
 
 wxFontWeight wxFont::GetWeight() const
 {
 
     return M_FONTDATA->GetStyle();
 }
 
 wxFontWeight wxFont::GetWeight() const
 {

-    wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") );
+    wxCHECK_MSG( IsOk(), 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( IsOk(), false, wxT("invalid font") );

 
     return M_FONTDATA->GetUnderlined();
 }
 
 wxString wxFont::GetFaceName() const
 {
 
     return M_FONTDATA->GetUnderlined();
 }
 
 wxString wxFont::GetFaceName() const
 {

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

 
     return M_FONTDATA->GetFaceName();
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {
 
     return M_FONTDATA->GetFaceName();
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {

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

 
     return M_FONTDATA->GetEncoding();
 }
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 
     return M_FONTDATA->GetEncoding();
 }
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {

-    return Ok() && M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
-                                           : NULL;
-}
-
-wxString wxFont::GetNativeFontInfoDesc() const
-{
-    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
-
-    // be sure we have an HFONT associated...
-    wxConstCast(this, wxFont)->RealizeResource();
-    return wxFontBase::GetNativeFontInfoDesc();
+    return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL;

 }
 
 }
 

-wxString wxFont::GetNativeFontInfoUserDesc() const
+bool wxFont::IsFixedWidth() const

 {
 {

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

 
 

-    // be sure we have an HFONT associated...
-    wxConstCast(this, wxFont)->RealizeResource();
-    return wxFontBase::GetNativeFontInfoUserDesc();
-}
+    // LOGFONT doesn't contain the correct pitch information so we need to call
+    // GetTextMetrics() to get it
+    ScreenHDC hdc;
+    SelectInHDC selectFont(hdc, M_FONTDATA->GetHFONT());

 
 

-bool wxFont::IsFixedWidth() const
-{
-    if ( M_FONTDATA->HasNativeFontInfo() )
+    TEXTMETRIC tm;
+    if ( !::GetTextMetrics(hdc, &tm) )

     {
     {

-        // the two low-order bits specify the pitch of the font, the rest is
-        // family
-        BYTE pitch =
-            (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);
-
-        return pitch == FIXED_PITCH;
+        wxLogLastError(wxT("GetTextMetrics"));
+        return false;

     }
 
     }
 

-    return wxFontBase::IsFixedWidth();
+    // Quoting MSDN description of TMPF_FIXED_PITCH: "Note very carefully that
+    // those meanings are the opposite of what the constant name implies."
+    return !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH);

 }
 }