toplevel code transferred to wxTopLevelWindow

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index c6b9720509dbf55318e0f6e1be704462cb745749..1a8b50c376d30baa812e624dec511c5efa8880f4 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__) && !defined(__WXMGL__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__)

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

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


@@ -140,6 +140,7 @@ bool wxFontBase::operator==(const wxFont& font) const
             GetPointSize() == font.GetPointSize() &&
             GetFamily() == font.GetFamily() &&
             GetStyle() == font.GetStyle() &&
             GetPointSize() == font.GetPointSize() &&
             GetFamily() == font.GetFamily() &&
             GetStyle() == font.GetStyle() &&

+            GetWeight() == font.GetWeight() &&

             GetUnderlined() == font.GetUnderlined() &&
             GetFaceName() == font.GetFaceName() &&
             GetEncoding() == font.GetEncoding()
             GetUnderlined() == font.GetUnderlined() &&
             GetFaceName() == font.GetFaceName() &&
             GetEncoding() == font.GetEncoding()


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

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

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