1 8. wxFrame support in wxrcedit
3 http://sourceforge.net/tracker/index.php?func=detail&aid=648659&group_id=9863&atid=309863
5 15. XRC fixes for <object_ref> and relative file names
7 Must be modified to be binary compatible before backporting!
9 Checking in xmlres.cpp;
10 /pack/cvsroots/wxwindows/wxWindows/contrib/src/xrc/xmlres.cpp,v <-- xmlres.cpp
11 new revision: 1.27; previous revision: 1.26
14 (also revision 1.30->1.31 of xmlres.cpp !!!)
17 /pack/cvsroots/wxwindows/wxWindows/contrib/include/wx/xrc/xmlres.h,v <-- xmlres.h
18 new revision: 1.22; previous revision: 1.21
20 17. XRC: better wxToolBar handler
22 Note: This depends on our agreement on what should be backported. Either
23 only XRC_ADD_STYLE(...) lines will go into 2.4 or everything in this
24 patch (including new features not present in 2.4.0's handler).
26 Checking in xh_toolb.cpp;
27 /pack/cvsroots/wxwindows/wxWindows/contrib/src/xrc/xh_toolb.cpp,v <-- xh_toolb.cpp
28 new revision: 1.7; previous revision: 1.6
30 22. "Remove" wxFont::GetInternalFont from wxGTK w/ GTK2
32 CVS: [RR] wxWindows/src/gtk dcclient.cpp,1.162,1.163 font.cpp,1.69,1.70 window.cpp,1.411,1.412
33 CVS: [RR] wxWindows/src/gtk choice.cpp,1.55,1.56 combobox.cpp,1.87,1.88
34 CVS: [RR] wxWindows/src/gtk minifram.cpp,1.29,1.30
35 (not sure about minifram.cpp: must be checked for binary compatibility - VS)
37 When applying, be careful to not pick later revision of font.cpp -- 2.5 doesn't
38 have wxFont::GetInternalFont while 2.4 must have it because of binary
41 26. Fix Unicode + .wxr
43 Using an #if wxUSE_UNICODE in include/wx/wxexpr.h, safer for
46 [Is this worth applying now this is deprecated? - JS]
48 Checking in include/wx/resource.h;
49 /pack/cvsroots/wxwindows/wxWindows/include/wx/resource.h,v <-- resource.h
50 new revision: 1.18; previous revision: 1.17
51 Checking in include/wx/wxexpr.h;
52 /pack/cvsroots/wxwindows/wxWindows/include/wx/wxexpr.h,v <-- wxexpr.h
53 new revision: 1.19; previous revision: 1.18
54 cvs diff: [23:38:56] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/include/wx
55 Checking in samples/resource/resource.cpp;
56 /pack/cvsroots/wxwindows/wxWindows/samples/resource/resource.cpp,v <-- resource.cpp
57 new revision: 1.14; previous revision: 1.13
58 cvs diff: [23:39:00] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/samples/resource
59 Checking in src/common/resource.cpp;
60 /pack/cvsroots/wxwindows/wxWindows/src/common/resource.cpp,v <-- resource.cpp
61 new revision: 1.85; previous revision: 1.84
62 Checking in src/common/wxexpr.cpp;
63 /pack/cvsroots/wxwindows/wxWindows/src/common/wxexpr.cpp,v <-- wxexpr.cpp
64 new revision: 1.27; previous revision: 1.26
66 31. [wxHTML] Fix parsing of CDATA tags and ignore <script>
68 CVS: [VS] wxWindows/src/html htmlpars.cpp,1.29,1.30 htmltag.cpp,1.31,1.32
69 CVS: [VS] wxWindows/src/html m_layout.cpp,1.17,1.18
70 CVS: [VS] wxWindows/src/html htmltag.cpp,1.32,1.33
72 32. Fix wxFileConfig behaviour in Unicode mode
74 Note: this must be done a bit differently, w/o wxFileConfig::m_conv!
75 CVS: [VS] wxWindows/include/wx fileconf.h,1.39,1.40
76 CVS: [VS] wxWindows/src/common fileconf.cpp,1.93,1.94
77 CVS: [VS] wxWindows/include/wx strconv.h,1.12,1.13
78 CVS: [VS] wxWindows/src/common strconv.cpp,1.71,1.72
80 36. Add SetFonts to wxHTML printing classes; SetFonts(a,b,NULL) can be used
81 to set default sizes now.
83 (Do not apply wxHtmlEasyPrinting part of this changes!)
85 Checking in src/html/winpars.cpp;
86 /pack/cvsroots/wxwindows/wxWindows/src/html/winpars.cpp,v <-- winpars.cpp
87 new revision: 1.38; previous revision: 1.37
88 Checking in src/html/htmprint.cpp;
89 /pack/cvsroots/wxwindows/wxWindows/src/html/htmprint.cpp,v <-- htmprint.cpp
90 new revision: 1.29; previous revision: 1.28
91 cvs diff: [21:30:15] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/src/html
92 Checking in samples/html/printing/printing.cpp;
93 /pack/cvsroots/wxwindows/wxWindows/samples/html/printing/printing.cpp,v <-- printing.cpp
94 new revision: 1.9; previous revision: 1.8
95 cvs diff: [21:30:19] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/samples/html/printing
96 Checking in include/wx/html/htmldefs.h;
97 /pack/cvsroots/wxwindows/wxWindows/include/wx/html/htmldefs.h,v <-- htmldefs.h
98 new revision: 1.8; previous revision: 1.7
99 Checking in include/wx/html/htmlwin.h;
100 /pack/cvsroots/wxwindows/wxWindows/include/wx/html/htmlwin.h,v <-- htmlwin.h
101 new revision: 1.35; previous revision: 1.34
102 Checking in include/wx/html/htmprint.h;
103 /pack/cvsroots/wxwindows/wxWindows/include/wx/html/htmprint.h,v <-- htmprint.h
104 new revision: 1.13; previous revision: 1.12
105 Checking in include/wx/html/winpars.h;
106 /pack/cvsroots/wxwindows/wxWindows/include/wx/html/winpars.h,v <-- winpars.h
107 new revision: 1.18; previous revision: 1.17
108 Checking in docs/changes.txt;
109 /pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
110 new revision: 1.258; previous revision: 1.257
111 Checking in docs/latex/wx/htwindow.tex;
112 /pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/htwindow.tex,v <-- htwindow.tex
113 new revision: 1.27; previous revision: 1.26
114 Checking in docs/latex/wx/htwinprs.tex;
115 /pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/htwinprs.tex,v <-- htwinprs.tex
116 new revision: 1.19; previous revision: 1.18
117 Checking in docs/latex/wx/htprint.tex;
118 /pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/htprint.tex,v <-- htprint.tex
119 new revision: 1.7; previous revision: 1.6
120 Checking in docs/latex/wx/htdcrend.tex;
121 /pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/htdcrend.tex,v <-- htdcrend.tex
122 new revision: 1.8; previous revision: 1.7
124 37. Backport wxLANGUAGE_CHINESE_TRADITIONAL fix in src/common/intl.cpp
125 (replace zh_CN with zh_TW)
127 I think this may already have been applied (JS)