Don't complain under MicroWindows if a wxDC's HDC is NULL - it happens

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index e973ffbc0d0924395040bc25efbdca8402298fb7..c6b9720509dbf55318e0f6e1be704462cb745749 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -77,7 +77,7 @@ wxFont *wxFontBase::New(const wxString& strNativeFontDesc)
 
 wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
 {
 
 wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
 {

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

     wxNativeFontInfo *fontInfo = new wxNativeFontInfo;
 
     fontInfo->pointSize = GetPointSize();
     wxNativeFontInfo *fontInfo = new wxNativeFontInfo;
 
     fontInfo->pointSize = GetPointSize();


@@ -96,7 +96,7 @@ wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
 
 void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
 {
 
 void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
 {

-#if !defined(__WXGTK__) && !defined(__WXMSW__)
+#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);


@@ -104,6 +104,8 @@ 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
 }
 


@@ -128,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


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

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

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


@@ -202,7 +214,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     //
     //  Ignore the version for now
     //
     //
     //  Ignore the version for now
     //

-    
+

     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;