new locales code checked in

[wxWidgets.git] / src / common / fontcmn.cpp

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 812c56c42c473c0777c75e5afb78d03a6e6ab90c..7044e66827f1e32b5b155b95d17b43a83cdf2d93 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -32,6 +32,8 @@
     #include "wx/font.h"
 #endif // WX_PRECOMP
 
+#include "wx/fontutil.h" // for wxNativeFontInfo
+
 #include "wx/tokenzr.h"
 
 // ============================================================================
@@ -62,22 +64,32 @@ wxFont *wxFontBase::New(const wxNativeFontInfo& info)
     return new wxFont(info);
 }
 
-wxNativeFontInfo wxFontBase::GetNativeFontInfo() const
+/* static */
+wxFont *wxFontBase::New(const wxString& strNativeFontDesc)
 {
-#if !defined(__WXGTK__)
     wxNativeFontInfo fontInfo;
+    if ( !fontInfo.FromString(strNativeFontDesc) )
+        return (wxFont *)NULL;
+
+    return New(fontInfo);
+}
+
+wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
+{
+#if !defined(__WXGTK__)
+    wxNativeFontInfo *fontInfo = new wxNativeFontInfo;
 
-    fontInfo.pointSize = GetPointSize();
-    fontInfo.family = GetFamily();
-    fontInfo.style = GetStyle();
-    fontInfo.weight = GetWeight();
-    fontInfo.underlined = GetUnderlined();
-    fontInfo.faceName = GetFaceName();
-    fontInfo.encoding = GetEncoding();
+    fontInfo->pointSize = GetPointSize();
+    fontInfo->family = GetFamily();
+    fontInfo->style = GetStyle();
+    fontInfo->weight = GetWeight();
+    fontInfo->underlined = GetUnderlined();
+    fontInfo->faceName = GetFaceName();
+    fontInfo->encoding = GetEncoding();
 
     return fontInfo;
 #else
-    return wxNullNativeFontInfo;
+    return (wxNativeFontInfo *)NULL;
 #endif
 }
 
@@ -94,6 +106,19 @@ void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
 #endif
 }
 
+wxString wxFontBase::GetNativeFontInfoDesc() const
+{
+    wxString fontDesc;
+    wxNativeFontInfo *fontInfo = GetNativeFontInfo();
+    if ( fontInfo )
+    {
+        fontDesc = fontInfo->ToString();
+        delete fontInfo;
+    }
+
+    return fontDesc;
+}
+
 wxFont& wxFont::operator=(const wxFont& font)
 {
     if ( this != &font )
@@ -195,7 +220,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
-    underlined = (int)l;
+    underlined = l != 0;
 
     faceName = tokenizer.GetNextToken();
     if( !faceName )
@@ -213,7 +238,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
 
-    s.Printf("%d;%d;%d;%d;%d;%s;%d",
+    s.Printf(_T("%d;%d;%d;%d;%d;%s;%d"),
              pointSize,
              family,
              style,
@@ -225,5 +250,5 @@ wxString wxNativeFontInfo::ToString() const
     return s;
 }
 
-#endif
+#endif // generic wxNativeFontInfo implementation