diff --git a/docs/toback24.txt b/docs/toback24.txt index e33e900751..f3dc641013 100644 --- a/docs/toback24.txt +++ b/docs/toback24.txt @@ -1,33 +1,10 @@ -8. wxFrame support in wxrcedit +1. wxFrame support in wxrcedit http://sourceforge.net/tracker/index.php?func=detail&aid=648659&group_id=9863&atid=309863 -15. XRC fixes for and relative file names +[Is this worth applying if wxrcedit is not supported? - VS] -Must be modified to be binary compatible before backporting! - -Checking in xmlres.cpp; -/pack/cvsroots/wxwindows/wxWindows/contrib/src/xrc/xmlres.cpp,v <-- xmlres.cpp -new revision: 1.27; previous revision: 1.26 -done - -(also revision 1.30->1.31 of xmlres.cpp !!!) - -Checking in xmlres.h; -/pack/cvsroots/wxwindows/wxWindows/contrib/include/wx/xrc/xmlres.h,v <-- xmlres.h -new revision: 1.22; previous revision: 1.21 - -17. XRC: better wxToolBar handler - -Note: This depends on our agreement on what should be backported. Either -only XRC_ADD_STYLE(...) lines will go into 2.4 or everything in this -patch (including new features not present in 2.4.0's handler). - -Checking in xh_toolb.cpp; -/pack/cvsroots/wxwindows/wxWindows/contrib/src/xrc/xh_toolb.cpp,v <-- xh_toolb.cpp -new revision: 1.7; previous revision: 1.6 - -22. "Remove" wxFont::GetInternalFont from wxGTK w/ GTK2 +2. "Remove" wxFont::GetInternalFont from wxGTK w/ GTK2 CVS: [RR] wxWindows/src/gtk dcclient.cpp,1.162,1.163 font.cpp,1.69,1.70 window.cpp,1.411,1.412 CVS: [RR] wxWindows/src/gtk choice.cpp,1.55,1.56 combobox.cpp,1.87,1.88 @@ -38,7 +15,7 @@ When applying, be careful to not pick later revision of font.cpp -- 2.5 doesn't have wxFont::GetInternalFont while 2.4 must have it because of binary compatibility! -26. Fix Unicode + .wxr +3. Fix Unicode + .wxr Using an #if wxUSE_UNICODE in include/wx/wxexpr.h, safer for binary compatibility. @@ -62,67 +39,3 @@ new revision: 1.85; previous revision: 1.84 Checking in src/common/wxexpr.cpp; /pack/cvsroots/wxwindows/wxWindows/src/common/wxexpr.cpp,v <-- wxexpr.cpp new revision: 1.27; previous revision: 1.26 - -31. [wxHTML] Fix parsing of CDATA tags and ignore