Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 3033c5d6ca1e0263ccab339d2828b891263ffee9..4fcd211e5350148f8f2434b45e3ad8edab2c40ca 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -303,7 +303,6 @@ bool wxFontBase::SetNativeFontInfo(const wxString& info)
         return true;
     }
 
         return true;
     }
 

-    UnRef();

     return false;
 }
 
     return false;
 }
 


@@ -316,7 +315,6 @@ bool wxFontBase::SetNativeFontInfoUserDesc(const wxString& info)
         return true;
     }
 
         return true;
     }
 

-    UnRef();

     return false;
 }
 
     return false;
 }
 


@@ -324,10 +322,16 @@ bool wxFontBase::operator==(const wxFont& font) const
 {
     // 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
 {
     // 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() ||
+    return IsSameAs(font) ||

            (
             Ok() == font.Ok() &&
             GetPointSize() == font.GetPointSize() &&
            (
             Ok() == font.Ok() &&
             GetPointSize() == font.GetPointSize() &&

+            // in wxGTK1 GetPixelSize() calls GetInternalFont() which uses
+            // operator==() resulting in infinite recursion so we can't use it
+            // in that port
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
+            GetPixelSize() == font.GetPixelSize() &&
+#endif

             GetFamily() == font.GetFamily() &&
             GetStyle() == font.GetStyle() &&
             GetWeight() == font.GetWeight() &&
             GetFamily() == font.GetFamily() &&
             GetStyle() == font.GetStyle() &&
             GetWeight() == font.GetWeight() &&


@@ -665,7 +669,10 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
 
     wxString face;
     unsigned long size;
 
     wxString face;
     unsigned long size;

-    bool weightfound = false, pointsizefound = false, encodingfound = false;
+    bool weightfound = false, pointsizefound = false;
+#if wxUSE_FONTMAP
+    bool encodingfound = false;
+#endif

 
     while ( tokenizer.HasMoreTokens() )
     {
 
     while ( tokenizer.HasMoreTokens() )
     {