fix for focus handling when deleting the items

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 812c56c42c473c0777c75e5afb78d03a6e6ab90c..c6b9720509dbf55318e0f6e1be704462cb745749 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -32,6 +32,9 @@
     #include "wx/font.h"
 #endif // WX_PRECOMP
 
     #include "wx/font.h"
 #endif // WX_PRECOMP
 

+#include "wx/gdicmn.h"
+#include "wx/fontutil.h" // for wxNativeFontInfo
+

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


@@ -62,28 +65,38 @@ wxFont *wxFontBase::New(const wxNativeFontInfo& info)
     return new wxFont(info);
 }
 
     return new wxFont(info);
 }
 

-wxNativeFontInfo wxFontBase::GetNativeFontInfo() const
+/* static */
+wxFont *wxFontBase::New(const wxString& strNativeFontDesc)

 {
 {

-#if !defined(__WXGTK__)

     wxNativeFontInfo fontInfo;
     wxNativeFontInfo fontInfo;

+    if ( !fontInfo.FromString(strNativeFontDesc) )
+        return new wxFont(*wxNORMAL_FONT);
+
+    return New(fontInfo);
+}

 
 

-    fontInfo.pointSize = GetPointSize();
-    fontInfo.family = GetFamily();
-    fontInfo.style = GetStyle();
-    fontInfo.weight = GetWeight();
-    fontInfo.underlined = GetUnderlined();
-    fontInfo.faceName = GetFaceName();
-    fontInfo.encoding = GetEncoding();
+wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
+{
+#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__)
+    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();

 
     return fontInfo;
 #else
 
     return fontInfo;
 #else

-    return wxNullNativeFontInfo;
+    return (wxNativeFontInfo *)NULL;

 #endif
 }
 
 void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
 {
 #endif
 }
 
 void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
 {

-#if !defined(__WXGTK__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__)

     SetPointSize(info.pointSize);
     SetFamily(info.family);
     SetStyle(info.style);
     SetPointSize(info.pointSize);
     SetFamily(info.family);
     SetStyle(info.style);


@@ -91,9 +104,24 @@ void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
     SetUnderlined(info.underlined);
     SetFaceName(info.faceName);
     SetEncoding(info.encoding);
     SetUnderlined(info.underlined);
     SetFaceName(info.faceName);
     SetEncoding(info.encoding);

+#else
+    (void)info;

 #endif
 }
 
 #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 )
 wxFont& wxFont::operator=(const wxFont& font)
 {
     if ( this != &font )


@@ -102,15 +130,25 @@ wxFont& wxFont::operator=(const wxFont& font)
     return (wxFont &)*this;
 }
 
     return (wxFont &)*this;
 }
 

-// VZ: is it correct to compare pointers and not the contents? (FIXME)

 bool wxFontBase::operator==(const wxFont& font) const
 {
 bool wxFontBase::operator==(const wxFont& font) const
 {

-    return GetFontData() == font.GetFontData();
+    // either it is the same font, i.e. they share the same common data or they
+    // have different ref datas but still describe the same font
+    return GetFontData() == font.GetFontData() ||
+           (
+            Ok() == font.Ok() &&
+            GetPointSize() == font.GetPointSize() &&
+            GetFamily() == font.GetFamily() &&
+            GetStyle() == font.GetStyle() &&
+            GetUnderlined() == font.GetUnderlined() &&
+            GetFaceName() == font.GetFaceName() &&
+            GetEncoding() == font.GetEncoding()
+           );

 }
 
 bool wxFontBase::operator!=(const wxFont& font) const
 {
 }
 
 bool wxFontBase::operator!=(const wxFont& font) const
 {

-    return GetFontData() != font.GetFontData();
+    return !(*this == font);

 }
 
 wxString wxFontBase::GetFamilyString() const
 }
 
 wxString wxFontBase::GetFamilyString() const


@@ -155,7 +193,7 @@ wxString wxFontBase::GetWeightString() const
     }
 }
 
     }
 }
 

-#if !defined(__WXGTK__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__) && !defined(__WXMGL__)

 
 // ----------------------------------------------------------------------------
 // wxNativeFontInfo
 
 // ----------------------------------------------------------------------------
 // wxNativeFontInfo


@@ -164,7 +202,7 @@ wxString wxFontBase::GetWeightString() const
 // These are the generic forms of FromString()/ToString.
 //
 // convert to/from the string representation: format is
 // These are the generic forms of FromString()/ToString.
 //
 // convert to/from the string representation: format is

-//      pointsize;family;style;weight;underlined;facename;encoding
+//      version;pointsize;family;style;weight;underlined;facename;encoding

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


@@ -173,6 +211,11 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     wxStringTokenizer tokenizer(s, _T(";"));
 
     wxString token = tokenizer.GetNextToken();
     wxStringTokenizer tokenizer(s, _T(";"));
 
     wxString token = tokenizer.GetNextToken();

+    //
+    //  Ignore the version for now
+    //
+
+    token = tokenizer.GetNextToken();

     if ( !token.ToLong(&l) )
         return FALSE;
     pointSize = (int)l;
     if ( !token.ToLong(&l) )
         return FALSE;
     pointSize = (int)l;


@@ -195,7 +238,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    underlined = (int)l;
+    underlined = l != 0;

 
     faceName = tokenizer.GetNextToken();
     if( !faceName )
 
     faceName = tokenizer.GetNextToken();
     if( !faceName )


@@ -213,7 +256,8 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
 
 {
     wxString s;
 

-    s.Printf("%d;%d;%d;%d;%d;%s;%d",
+    s.Printf(_T("%d;%d;%d;%d;%d;%d;%s;%d"),
+             0,                                 // version

              pointSize,
              family,
              style,
              pointSize,
              family,
              style,


@@ -225,5 +269,5 @@ wxString wxNativeFontInfo::ToString() const
     return s;
 }
 
     return s;
 }
 

-#endif
+#endif // generic wxNativeFontInfo implementation