remove wxTextAttr::CreateFont(); return wxNullFont from GetFont() if we have no font...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 926e6c226b9df0c318e6f23336a618c2dedf496f..23f9a465493cd8963724a1f077b67bbab5f74c6a 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -278,9 +278,6 @@ public:
     // Partial equality test taking flags into account
     bool EqPartial(const wxTextAttr& attr, int flags) const;
 
     // Partial equality test taking flags into account
     bool EqPartial(const wxTextAttr& attr, int flags) const;
 

-    // Create font from font attributes.
-    wxFont CreateFont() const;
-

     // Get attributes from font.
     bool GetFontAttributes(const wxFont& font, int flags = wxTEXT_ATTR_FONT);
 
     // Get attributes from font.
     bool GetFontAttributes(const wxFont& font, int flags = wxTEXT_ATTR_FONT);
 


@@ -337,7 +334,7 @@ public:
     const wxString& GetFontFaceName() const { return m_fontFaceName; }
     wxFontEncoding GetFontEncoding() const { return m_fontEncoding; }
 
     const wxString& GetFontFaceName() const { return m_fontFaceName; }
     wxFontEncoding GetFontEncoding() const { return m_fontEncoding; }
 

-    wxFont GetFont() const { return CreateFont(); }
+    wxFont GetFont() const;

 
     const wxString& GetCharacterStyleName() const { return m_characterStyleName; }
     const wxString& GetParagraphStyleName() const { return m_paragraphStyleName; }
 
     const wxString& GetCharacterStyleName() const { return m_characterStyleName; }
     const wxString& GetParagraphStyleName() const { return m_paragraphStyleName; }

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 1e0a0a0f5677a9a6363fb1c8b59f76e2fcd95d77..c69ba3aea19ae1b29dfefeac3d2f926f058706ae 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -297,8 +297,11 @@ bool wxTextAttr::EqPartial(const wxTextAttr& attr, int flags) const
 }
 
 // Create font from font attributes.
 }
 
 // Create font from font attributes.

-wxFont wxTextAttr::CreateFont() const
+wxFont wxTextAttr::GetFont() const

 {
 {

+    if ( !HasFont() )
+        return wxNullFont;
+

     int fontSize = 10;
     if (HasFontSize())
         fontSize = GetFontSize();
     int fontSize = 10;
     if (HasFontSize())
         fontSize = GetFontSize();