added wxTextAttr::Merge (modified patch 1482719)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-06 16:16:25 +00:00
parent 6e86472fa5
commit 53ee60908a
3 changed files with 31 additions and 0 deletions
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -131,6 +131,7 @@ All (GUI):
 - Added an easier to use wxMenu::AppendSubMenu()
 - wxString <-> wxColour conversions in wxColour class (Francesco Montorsi).
 - Fixed bug with ignoring blank lines in multiline wxGrid cell labels
+- Added wxTextAttr::Merge() (Marcin Simonides)

 wxMSW: