Added a SetFont method that behaves like SetLabel does with respect to

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 071d8b0bd9371febb0c8ddb710a0278ab90b7b54..7dd7f375a5ec944c6f918be47c2bd7871d45b741 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -29,18 +29,28 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include <stdio.h>

     #include "wx/setup.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/font.h"
     #include "wx/setup.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/font.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

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

 #include "wx/msw/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 #include "wx/msw/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the default font size in points
+static const int wxDEFAULT_FONT_SIZE = 12;
+

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


@@ -52,7 +62,7 @@ friend class WXDLLEXPORT wxFont;
 public:
     wxFontRefData()
     {
 public:
     wxFontRefData()
     {

-        Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
+        Init(wxDEFAULT_FONT_SIZE, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,

              "", wxFONTENCODING_DEFAULT);
     }
 
              "", wxFONTENCODING_DEFAULT);
     }
 


@@ -75,6 +85,11 @@ public:
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
 
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
 

+    wxFontRefData(const wxNativeFontInfo& info) 
+    {
+        Init(info);
+    }
+

     virtual ~wxFontRefData();
 
 protected:
     virtual ~wxFontRefData();
 
 protected:


@@ -87,6 +102,8 @@ 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;
     // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE
     // DELETED by destructor
     bool          m_temporary;


@@ -104,6 +121,10 @@ protected:
 
     // Windows font handle
     WXHFONT       m_hFont;
 
     // Windows font handle
     WXHFONT       m_hFont;

+    
+    // Native font info
+    wxNativeFontInfo m_nativeFontInfo;
+    bool             m_nativeFontInfoOk;

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -135,6 +156,89 @@ void wxFontRefData::Init(int pointSize,
     m_temporary = FALSE;
 
     m_hFont = 0;
     m_temporary = FALSE;
 
     m_hFont = 0;

+    
+    m_nativeFontInfoOk = FALSE;
+}
+
+void wxFontRefData::Init(const wxNativeFontInfo& info)
+{
+    // 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;
+
+    switch ( lfFamily )
+    {
+        case FF_ROMAN:
+            m_family = wxROMAN;
+            break;
+
+        case FF_SWISS:
+            m_family = wxSWISS;
+            break;
+
+        case FF_SCRIPT:
+            m_family = wxSCRIPT;
+            break;
+
+        case FF_MODERN:
+            m_family = wxMODERN;
+            break;
+
+        case FF_DECORATIVE:
+            m_family = wxDECORATIVE;
+            break;
+
+        default:
+            m_family = wxSWISS;
+    }
+
+    // weight and style
+    switch ( info.lf.lfWeight )
+    {
+        case FW_LIGHT:
+            m_weight = wxLIGHT;
+            break;
+
+        default:
+        case FW_NORMAL:
+            m_weight = wxNORMAL;
+            break;
+
+        case FW_BOLD:
+            m_weight = wxBOLD;
+            break;
+    }
+
+    m_style = info.lf.lfItalic ? wxITALIC : wxNORMAL;
+
+    m_underlined = info.lf.lfUnderline != 0;
+
+    m_faceName = info.lf.lfFaceName;
+
+    // remember that 1pt = 1/72inch
+    int height = abs(info.lf.lfHeight);
+
+#if wxUSE_SCREEN_DPI
+    HDC dc = ::GetDC(NULL);
+    static const int ppInch = GetDeviceCaps(dc, LOGPIXELSY);
+    ::ReleaseDC(NULL, dc);
+#else
+    static const int ppInch = 96;
+#endif
+    m_pointSize = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
+    
+    m_encoding = wxGetFontEncFromCharSet(info.lf.lfCharSet);
+    
+    m_fontId = 0;
+    m_temporary = FALSE;
+
+    m_hFont = 0;
+    
+    m_nativeFontInfoOk = TRUE;
+    m_nativeFontInfo = info;

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


@@ -148,6 +252,119 @@ wxFontRefData::~wxFontRefData()
     }
 }
 
     }
 }
 

+
+// ----------------------------------------------------------------------------
+// wxNativeFontInfo
+// ----------------------------------------------------------------------------
+
+bool wxNativeFontInfo::FromString(const wxString& s)
+{
+    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 = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfUnderline = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfStrikeOut = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfCharSet = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfOutPrecision = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfClipPrecision = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfQuality = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfPitchAndFamily = l;
+
+    token = tokenizer.GetNextToken();
+    if(!token)
+        return FALSE;
+    wxStrcpy(lf.lfFaceName, token.c_str());
+
+    return TRUE;
+}
+
+wxString wxNativeFontInfo::ToString() const
+{
+    wxString s;
+
+    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 s;
+}
+

 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------


@@ -158,6 +375,24 @@ void wxFont::Init()
         wxTheFontList->Append(this);
 }
 
         wxTheFontList->Append(this);
 }
 

+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    UnRef();
+
+    m_refData = new wxFontRefData(info);
+
+    RealizeResource();
+
+    return TRUE;
+}
+
+wxFont::wxFont(const wxString& fontdesc)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);
+}
+

 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */


@@ -170,6 +405,12 @@ bool wxFont::Create(int pointSize,
                     wxFontEncoding encoding)
 {
     UnRef();
                     wxFontEncoding encoding)
 {
     UnRef();

+
+    // 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;
+

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


@@ -197,10 +438,14 @@ bool wxFont::RealizeResource()
         return TRUE;
     }
 
         return TRUE;
     }
 

-    LOGFONT lf;
-    wxFillLogFont(&lf, this);
-    M_FONTDATA->m_hFont = (WXHFONT)::CreateFontIndirect(&lf);
-    M_FONTDATA->m_faceName = lf.lfFaceName;
+    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"));
     if ( !M_FONTDATA->m_hFont )
     {
         wxLogLastError(wxT("CreateFont"));


@@ -269,6 +514,7 @@ void wxFont::SetPointSize(int pointSize)
     Unshare();
 
     M_FONTDATA->m_pointSize = pointSize;
     Unshare();
 
     M_FONTDATA->m_pointSize = pointSize;

+    M_FONTDATA->m_nativeFontInfoOk = FALSE;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -278,6 +524,7 @@ void wxFont::SetFamily(int family)
     Unshare();
 
     M_FONTDATA->m_family = family;
     Unshare();
 
     M_FONTDATA->m_family = family;

+    M_FONTDATA->m_nativeFontInfoOk = FALSE;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -287,6 +534,7 @@ void wxFont::SetStyle(int style)
     Unshare();
 
     M_FONTDATA->m_style = style;
     Unshare();
 
     M_FONTDATA->m_style = style;

+    M_FONTDATA->m_nativeFontInfoOk = FALSE;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -296,6 +544,7 @@ void wxFont::SetWeight(int weight)
     Unshare();
 
     M_FONTDATA->m_weight = weight;
     Unshare();
 
     M_FONTDATA->m_weight = weight;

+    M_FONTDATA->m_nativeFontInfoOk = FALSE;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -305,6 +554,7 @@ void wxFont::SetFaceName(const wxString& faceName)
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;

+    M_FONTDATA->m_nativeFontInfoOk = FALSE;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -314,6 +564,7 @@ void wxFont::SetUnderlined(bool underlined)
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;

+    M_FONTDATA->m_nativeFontInfoOk = FALSE;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -323,6 +574,18 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     Unshare();
 
     M_FONTDATA->m_encoding = encoding;
     Unshare();
 
     M_FONTDATA->m_encoding = encoding;

+    M_FONTDATA->m_nativeFontInfoOk = FALSE;
+
+    RealizeResource();
+}
+
+void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+    Unshare();
+ 
+    FreeResource();   
+
+    M_FONTDATA->Init(info);

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -374,3 +637,11 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

+wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+    if( M_FONTDATA->m_nativeFontInfoOk )
+        return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+        
+    return 0;
+}
+