X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1e5be0ec67336ae78da743ad92216b3108365b6..b53aea81d2e102224b452ef5bf7aee1132f37c6f:/src/common/textcmn.cpp diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index 53dd431459..6d7fb083c8 100644 --- a/src/common/textcmn.cpp +++ b/src/common/textcmn.cpp @@ -49,10 +49,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN) +wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_URL, wxTextUrlEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_MAXLEN, wxCommandEvent ) IMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl) @@ -85,10 +85,11 @@ void wxTextAttr::Init() m_rightIndent = 0; m_fontSize = 12; - m_fontStyle = wxNORMAL; - m_fontWeight = wxNORMAL; + m_fontStyle = wxFONTSTYLE_NORMAL; + m_fontWeight = wxFONTWEIGHT_NORMAL; m_fontUnderlined = false; m_fontEncoding = wxFONTENCODING_DEFAULT; + m_fontFamily = wxFONTFAMILY_DEFAULT; m_paragraphSpacingAfter = 0; m_paragraphSpacingBefore = 0; @@ -118,6 +119,7 @@ void wxTextAttr::Copy(const wxTextAttr& attr) m_fontUnderlined = attr.m_fontUnderlined; m_fontFaceName = attr.m_fontFaceName; m_fontEncoding = attr.m_fontEncoding; + m_fontFamily = attr.m_fontFamily; m_textEffects = attr.m_textEffects; m_textEffectFlags = attr.m_textEffectFlags; @@ -181,6 +183,7 @@ bool wxTextAttr::operator== (const wxTextAttr& attr) const GetFontUnderlined() == attr.GetFontUnderlined() && GetFontFaceName() == attr.GetFontFaceName() && GetFontEncoding() == attr.GetFontEncoding() && + GetFontFamily() == attr.GetFontFamily() && GetURL() == attr.GetURL(); } @@ -218,6 +221,10 @@ bool wxTextAttr::EqPartial(const wxTextAttr& attr, int flags) const GetFontEncoding() != attr.GetFontEncoding()) return false; + if ((flags & wxTEXT_ATTR_FONT_FAMILY) && + GetFontFamily() != attr.GetFontFamily()) + return false; + if ((flags & wxTEXT_ATTR_URL) && GetURL() != attr.GetURL()) return false; @@ -326,7 +333,11 @@ wxFont wxTextAttr::GetFont() const if (HasFontEncoding()) encoding = GetFontEncoding(); - wxFont font(fontSize, wxDEFAULT, fontStyle, fontWeight, underlined, fontFaceName, encoding); + int fontFamily = wxFONTFAMILY_DEFAULT; + if (HasFontFamily()) + fontFamily = GetFontFamily(); + + wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding); #ifdef __WXMAC__ font.SetNoAntiAliasing(true); #endif @@ -357,6 +368,9 @@ bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags) if (flags & wxTEXT_ATTR_FONT_ENCODING) m_fontEncoding = font.GetEncoding(); + if (flags & wxTEXT_ATTR_FONT_FAMILY) + m_fontFamily = font.GetFamily(); + m_flags |= flags; return true; @@ -414,6 +428,12 @@ bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith) destStyle.SetFontEncoding(style.GetFontEncoding()); } + if (style.HasFontFamily()) + { + if (!(compareWith && compareWith->HasFontFamily() && compareWith->GetFontFamily() == style.GetFontFamily())) + destStyle.SetFontFamily(style.GetFontFamily()); + } + if (style.GetTextColour().Ok() && style.HasTextColour()) { if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour())) @@ -994,6 +1014,6 @@ bool wxTextCtrlBase::SendTextUpdatedEvent(wxWindow *win) // define this one even if !wxUSE_TEXTCTRL because it is also used by other // controls (wxComboBox and wxSpinCtrl) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED) +wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent ) #endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL