X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90761420ee8333764c0e5662d5616c5794acbe5b..b7005dfd8a49d599a26e78bee3a42737f554a91c:/src/common/textcmn.cpp diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index ed3e07f505..46847431f1 100644 --- a/src/common/textcmn.cpp +++ b/src/common/textcmn.cpp @@ -103,8 +103,8 @@ wxEND_FLAGS( wxTextCtrlStyle ) wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl, "wx/textctrl.h") wxBEGIN_PROPERTIES_TABLE(wxTextCtrl) -wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent ) -wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent ) +wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent ) +wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent ) wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \ 0 /*flags*/, wxT("Helpstring"), wxT("group") ) @@ -125,10 +125,10 @@ wxCONSTRUCTOR_6( wxTextCtrl, wxWindow*, Parent, wxWindowID, Id, \ IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent) -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 ); +wxDEFINE_EVENT( wxEVT_TEXT, wxCommandEvent ); +wxDEFINE_EVENT( wxEVT_TEXT_ENTER, wxCommandEvent ); +wxDEFINE_EVENT( wxEVT_TEXT_URL, wxTextUrlEvent ); +wxDEFINE_EVENT( wxEVT_TEXT_MAXLEN, wxCommandEvent ); IMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl) @@ -267,117 +267,138 @@ bool wxTextAttr::operator== (const wxTextAttr& attr) const } // Partial equality test. Only returns false if an attribute doesn't match. -bool wxTextAttr::EqPartial(const wxTextAttr& attr) const +bool wxTextAttr::EqPartial(const wxTextAttr& attr, bool weakTest) const { int flags = attr.GetFlags(); - - if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && GetTextColour() != attr.GetTextColour()) + + if (!weakTest && + ((!HasTextColour() && attr.HasTextColour()) || + (!HasBackgroundColour() && attr.HasBackgroundColour()) || + (!HasFontFaceName() && attr.HasFontFaceName()) || + (!HasFontSize() && attr.HasFontSize()) || + (!HasFontWeight() && attr.HasFontWeight()) || + (!HasFontItalic() && attr.HasFontItalic()) || + (!HasFontUnderlined() && attr.HasFontUnderlined()) || + (!HasFontStrikethrough() && attr.HasFontStrikethrough()) || + (!HasFontEncoding() && attr.HasFontEncoding()) || + (!HasFontFamily() && attr.HasFontFamily()) || + (!HasURL() && attr.HasURL()) || + (!HasAlignment() && attr.HasAlignment()) || + (!HasLeftIndent() && attr.HasLeftIndent()) || + (!HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter()) || + (!HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore()) || + (!HasLineSpacing() && attr.HasLineSpacing()) || + (!HasCharacterStyleName() && attr.HasCharacterStyleName()) || + (!HasParagraphStyleName() && attr.HasParagraphStyleName()) || + (!HasListStyleName() && attr.HasListStyleName()) || + (!HasBulletStyle() && attr.HasBulletStyle()) || + (!HasBulletNumber() && attr.HasBulletNumber()) || + (!HasBulletText() && attr.HasBulletText()) || + (!HasBulletName() && attr.HasBulletName()) || + (!HasTabs() && attr.HasTabs()) || + (!HasTextEffects() && attr.HasTextEffects()) || + (!HasOutlineLevel() && attr.HasOutlineLevel()))) + { + return false; + } + + if (HasTextColour() && attr.HasTextColour() && GetTextColour() != attr.GetTextColour()) + return false; + + if (HasBackgroundColour() && attr.HasBackgroundColour() && GetBackgroundColour() != attr.GetBackgroundColour()) + return false; + + if (HasFontFaceName() && attr.HasFontFaceName() && GetFontFaceName() != attr.GetFontFaceName()) + return false; + + // This checks whether the two objects have the same font size dimension (px versus pt) + if (HasFontSize() && attr.HasFontSize() && (flags & wxTEXT_ATTR_FONT) != (GetFlags() & wxTEXT_ATTR_FONT)) return false; - if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && GetBackgroundColour() != attr.GetBackgroundColour()) + if (HasFontPointSize() && attr.HasFontPointSize() && GetFontSize() != attr.GetFontSize()) return false; - if ((flags & wxTEXT_ATTR_FONT_FACE) && - GetFontFaceName() != attr.GetFontFaceName()) + if (HasFontPixelSize() && attr.HasFontPixelSize() && GetFontSize() != attr.GetFontSize()) return false; - if ((flags & wxTEXT_ATTR_FONT_SIZE) && - GetFontSize() != attr.GetFontSize()) + if (HasFontWeight() && attr.HasFontWeight() && GetFontWeight() != attr.GetFontWeight()) return false; - if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && - GetFontWeight() != attr.GetFontWeight()) + if (HasFontItalic() && attr.HasFontItalic() && GetFontStyle() != attr.GetFontStyle()) return false; - if ((flags & wxTEXT_ATTR_FONT_ITALIC) && - GetFontStyle() != attr.GetFontStyle()) + if (HasFontUnderlined() && attr.HasFontUnderlined() && GetFontUnderlined() != attr.GetFontUnderlined()) return false; - if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && - GetFontUnderlined() != attr.GetFontUnderlined()) + if (HasFontStrikethrough() && attr.HasFontStrikethrough() && GetFontStrikethrough() != attr.GetFontStrikethrough()) return false; - if ((flags & wxTEXT_ATTR_FONT_ENCODING) && - GetFontEncoding() != attr.GetFontEncoding()) + if (HasFontEncoding() && attr.HasFontEncoding() && GetFontEncoding() != attr.GetFontEncoding()) return false; - if ((flags & wxTEXT_ATTR_FONT_FAMILY) && - GetFontFamily() != attr.GetFontFamily()) + if (HasFontFamily() && attr.HasFontFamily() && GetFontFamily() != attr.GetFontFamily()) return false; - if ((flags & wxTEXT_ATTR_URL) && GetURL() != attr.GetURL()) + if (HasURL() && attr.HasURL() && GetURL() != attr.GetURL()) return false; - if ((flags & wxTEXT_ATTR_ALIGNMENT) && GetAlignment() != attr.GetAlignment()) + if (HasAlignment() && attr.HasAlignment() && GetAlignment() != attr.GetAlignment()) return false; - if ((flags & wxTEXT_ATTR_LEFT_INDENT) && + if (HasLeftIndent() && attr.HasLeftIndent() && ((GetLeftIndent() != attr.GetLeftIndent()) || (GetLeftSubIndent() != attr.GetLeftSubIndent()))) return false; - if ((flags & wxTEXT_ATTR_RIGHT_INDENT) && - (GetRightIndent() != attr.GetRightIndent())) + if (HasRightIndent() && attr.HasRightIndent() && (GetRightIndent() != attr.GetRightIndent())) return false; - if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) && + if (HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter() && (GetParagraphSpacingAfter() != attr.GetParagraphSpacingAfter())) return false; - if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) && + if (HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore() && (GetParagraphSpacingBefore() != attr.GetParagraphSpacingBefore())) return false; - if ((flags & wxTEXT_ATTR_LINE_SPACING) && - (GetLineSpacing() != attr.GetLineSpacing())) + if (HasLineSpacing() && attr.HasLineSpacing() && (GetLineSpacing() != attr.GetLineSpacing())) return false; - if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) && - (GetCharacterStyleName() != attr.GetCharacterStyleName())) + if (HasCharacterStyleName() && attr.HasCharacterStyleName() && (GetCharacterStyleName() != attr.GetCharacterStyleName())) return false; - if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && - (GetParagraphStyleName() != attr.GetParagraphStyleName())) + if (HasParagraphStyleName() && attr.HasParagraphStyleName() && (GetParagraphStyleName() != attr.GetParagraphStyleName())) return false; - if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) && - (GetListStyleName() != attr.GetListStyleName())) + if (HasListStyleName() && attr.HasListStyleName() && (GetListStyleName() != attr.GetListStyleName())) return false; - if ((flags & wxTEXT_ATTR_BULLET_STYLE) && - (GetBulletStyle() != attr.GetBulletStyle())) + if (HasBulletStyle() && attr.HasBulletStyle() && (GetBulletStyle() != attr.GetBulletStyle())) return false; - if ((flags & wxTEXT_ATTR_BULLET_NUMBER) && - (GetBulletNumber() != attr.GetBulletNumber())) + if (HasBulletNumber() && attr.HasBulletNumber() && (GetBulletNumber() != attr.GetBulletNumber())) return false; - if ((flags & wxTEXT_ATTR_BULLET_TEXT) && + if (HasBulletText() && attr.HasBulletText() && (GetBulletText() != attr.GetBulletText()) && (GetBulletFont() != attr.GetBulletFont())) return false; - if ((flags & wxTEXT_ATTR_BULLET_NAME) && - (GetBulletName() != attr.GetBulletName())) + if (HasBulletName() && attr.HasBulletName() && (GetBulletName() != attr.GetBulletName())) return false; - if ((flags & wxTEXT_ATTR_TABS) && - !TabsEq(GetTabs(), attr.GetTabs())) + if (HasTabs() && attr.HasTabs() && !TabsEq(GetTabs(), attr.GetTabs())) return false; - if ((flags & wxTEXT_ATTR_PAGE_BREAK) && - (HasPageBreak() != attr.HasPageBreak())) + if ((HasPageBreak() != attr.HasPageBreak())) return false; - if (flags & wxTEXT_ATTR_EFFECTS) + if (HasTextEffects() && attr.HasTextEffects()) { - if (HasTextEffects() != attr.HasTextEffects()) - return false; if (!BitlistsEqPartial(GetTextEffects(), attr.GetTextEffects(), attr.GetTextEffectFlags())) return false; } - if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) && - (GetOutlineLevel() != attr.GetOutlineLevel())) + if (HasOutlineLevel() && attr.HasOutlineLevel() && (GetOutlineLevel() != attr.GetOutlineLevel())) return false; return true; @@ -393,11 +414,11 @@ wxFont wxTextAttr::GetFont() const if (HasFontSize()) fontSize = GetFontSize(); - int fontStyle = wxNORMAL; + wxFontStyle fontStyle = wxFONTSTYLE_NORMAL; if (HasFontItalic()) fontStyle = GetFontStyle(); - int fontWeight = wxNORMAL; + wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL; if (HasFontWeight()) fontWeight = GetFontWeight(); @@ -406,7 +427,7 @@ wxFont wxTextAttr::GetFont() const underlined = GetFontUnderlined(); bool strikethrough = false; - if ( HasFontStrikethrough() ) + if (HasFontStrikethrough()) strikethrough = GetFontStrikethrough(); wxString fontFaceName; @@ -421,10 +442,20 @@ wxFont wxTextAttr::GetFont() const if (HasFontFamily()) fontFamily = GetFontFamily(); - wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding); - if ( strikethrough ) - font.SetStrikethrough( true ); - return font; + if (HasFontPixelSize()) + { + wxFont font(wxSize(0, fontSize), fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding); + if (strikethrough) + font.SetStrikethrough(true); + return font; + } + else + { + wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding); + if (strikethrough) + font.SetStrikethrough(true); + return font; + } } // Get attributes from font. @@ -433,8 +464,30 @@ bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags) if (!font.IsOk()) return false; - if (flags & wxTEXT_ATTR_FONT_SIZE) + // If we pass both pixel and point size attributes, this is an indication + // to choose the most appropriate units. + if ((flags & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT) + { + if (font.IsUsingSizeInPixels()) + { + m_fontSize = font.GetPixelSize().y; + flags &= ~wxTEXT_ATTR_FONT_POINT_SIZE; + } + else + { + m_fontSize = font.GetPointSize(); + flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE; + } + } + else if (flags & wxTEXT_ATTR_FONT_POINT_SIZE) + { m_fontSize = font.GetPointSize(); + flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE; + } + else if (flags & wxTEXT_ATTR_FONT_PIXEL_SIZE) + { + m_fontSize = font.GetPixelSize().y; + } if (flags & wxTEXT_ATTR_FONT_ITALIC) m_fontStyle = font.GetStyle(); @@ -493,10 +546,15 @@ bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith) destStyle.SetFontWeight(style.GetFontWeight()); } - if (style.HasFontSize()) + if (style.HasFontPointSize()) + { + if (!(compareWith && compareWith->HasFontPointSize() && compareWith->GetFontSize() == style.GetFontSize())) + destStyle.SetFontPointSize(style.GetFontSize()); + } + else if (style.HasFontPixelSize()) { - if (!(compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize())) - destStyle.SetFontSize(style.GetFontSize()); + if (!(compareWith && compareWith->HasFontPixelSize() && compareWith->GetFontSize() == style.GetFontSize())) + destStyle.SetFontPixelSize(style.GetFontSize()); } if (style.HasFontItalic()) @@ -949,14 +1007,14 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event) #ifndef __WIN32__ wxChar ch = 0; int keycode = event.GetKeyCode(); - + long from, to; GetSelection(&from,&to); long insert = GetInsertionPoint(); long last = GetLastPosition(); - - // catch arrow left and right - + + // catch arrow left and right + switch ( keycode ) { case WXK_LEFT: @@ -1081,6 +1139,18 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event) return handled; } +// ---------------------------------------------------------------------------- +// Other miscellaneous stuff +// ---------------------------------------------------------------------------- + +bool wxTextCtrlBase::SetHint(const wxString& hint) +{ + wxCHECK_MSG( IsSingleLine(), false, + wxS("Hints can only be set for single line text controls") ); + + return wxTextEntry::SetHint(hint); +} + // do the window-specific processing after processing the update event void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event) { @@ -1143,6 +1213,6 @@ wxPoint wxTextAreaBase::DoPositionToCoords(long WXUNUSED(pos)) const // define this one even if !wxUSE_TEXTCTRL because it is also used by other // controls (wxComboBox and wxSpinCtrl) -wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent ); +wxDEFINE_EVENT( wxEVT_TEXT, wxCommandEvent ); #endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL