-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 <object_ref> and relative file names
+[Is this worth applying if wxrcedit is not supported? - VS]
-Must be modified to be binary compatible before backporting!
+2. "Remove" wxFont::GetInternalFont from wxGTK w/ GTK2
-Checking in xmlres.cpp;
-/pack/cvsroots/wxwindows/wxWindows/contrib/src/xrc/xmlres.cpp,v <-- xmlres.cpp
-new revision: 1.27; previous revision: 1.26
+CVS: [RR] wxWidgets/src/gtk dcclient.cpp,1.162,1.163 font.cpp,1.69,1.70 window.cpp,1.411,1.412
+CVS: [RR] wxWidgets/src/gtk choice.cpp,1.55,1.56 combobox.cpp,1.87,1.88
+CVS: [RR] wxWidgets/src/gtk minifram.cpp,1.29,1.30
+ (not sure about minifram.cpp: must be checked for binary compatibility - VS)
+
+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!
+
+3. Add Windows XP manifests to wx.rc
+
+RCS file: /pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/wx.manifest,v
+done
+Checking in wx.manifest;
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/wx.manifest,v <-- wx.manifest
+initial revision: 1.1
+done
+Checking in wx.rc;
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/wx.rc,v <-- wx.rc
+new revision: 1.29; previous revision: 1.28
done
-(also revision 1.30->1.31 of xmlres.cpp !!!)
+5. proper AcceptsFocus() implementation for containers
-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
+http://sf.net/tracker/index.php?func=detail&aid=718913&group_id=9863&atid=309863
-17. XRC: better wxToolBar handler
+Checking in include/wx/containr.h;
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/containr.h,v <-- containr.h
+new revision: 1.10; previous revision: 1.9
+Checking in src/common/containr.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/common/containr.cpp,v <-- containr.cpp
+new revision: 1.17; previous revision: 1.16
-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).
+6. fixes for user dash wxPens handling
-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
+http://sf.net/tracker/index.php?func=detail&aid=717736&group_id=9863&atid=309863
-22. "Remove" wxFont::GetInternalFont from wxGTK w/ GTK2
+Checking in include/wx/msw/pen.h;
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/pen.h,v <-- pen.h
+new revision: 1.16; previous revision: 1.15
+Checking in src/msw/pen.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/pen.cpp,v <-- pen.cpp
+new revision: 1.20; previous revision: 1.19
+Checking in src/gtk/pen.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/gtk/pen.cpp,v <-- pen.cpp
+new revision: 1.23; previous revision: 1.22
+Checking in samples/drawing/drawing.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/samples/drawing/drawing.cpp,v <-- drawing.cpp
+new revision: 1.67; previous revision: 1.66
+Checking in docs/changes.txt;
+/pack/cvsroots/wxwindows/wxWidgets/docs/changes.txt,v <-- changes.txt
+new revision: 1.266; previous revision: 1.265
-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
-CVS: [RR] wxWindows/src/gtk minifram.cpp,1.29,1.30
- (not sure about minifram.cpp: must be checked for binary compatibility - VS)
+8. UnixWare compilation fixes:
-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!
+Don't forget to rerun autoconf to regenerate configure!
-26. Fix Unicode + .wxr
+Checking in configure.in;
+/pack/cvsroots/wxwindows/wxWidgets/configure.in,v <-- configure.in
+new revision: 1.664; previous revision: 1.663
+Checking in setup.h.in;
+/pack/cvsroots/wxwindows/wxWidgets/setup.h.in,v <-- setup.h.in
+new revision: 1.111; previous revision: 1.110
+Checking in src/unix/gsocket.c;
+/pack/cvsroots/wxwindows/wxWidgets/src/unix/gsocket.c,v <-- gsocket.c
+new revision: 1.72; previous revision: 1.71
-Using an #if wxUSE_UNICODE in include/wx/wxexpr.h, safer for
-binary compatibility.
+9. wxSemaphore methods returned incorrect values:
-[Is this worth applying now this is deprecated? - JS]
+Checking in src/msw/thread.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/thread.cpp,v <-- thread.cpp
+new revision: 1.62; previous revision: 1.61
+Checking in src/unix/threadpsx.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/unix/threadpsx.cpp,v <-- threadpsx.cpp
+new revision: 1.62; previous revision: 1.61
-Checking in include/wx/resource.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/resource.h,v <-- resource.h
-new revision: 1.18; previous revision: 1.17
-Checking in include/wx/wxexpr.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/wxexpr.h,v <-- wxexpr.h
-new revision: 1.19; previous revision: 1.18
-cvs diff: [23:38:56] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/include/wx
-Checking in samples/resource/resource.cpp;
-/pack/cvsroots/wxwindows/wxWindows/samples/resource/resource.cpp,v <-- resource.cpp
-new revision: 1.14; previous revision: 1.13
-cvs diff: [23:39:00] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/samples/resource
-Checking in src/common/resource.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/resource.cpp,v <-- resource.cpp
-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
+10. Unix/OpenGL build fix:
-31. [wxHTML] Fix parsing of CDATA tags and ignore <script>
+Don't forget to rerun autoconf to regenerate configure!
-CVS: [VS] wxWindows/src/html htmlpars.cpp,1.29,1.30 htmltag.cpp,1.31,1.32
-CVS: [VS] wxWindows/src/html m_layout.cpp,1.17,1.18
-CVS: [VS] wxWindows/src/html htmltag.cpp,1.32,1.33
+Checking in configure.in;
+/pack/cvsroots/wxwindows/wxWidgets/configure.in,v <-- configure.in
+new revision: 1.666; previous revision: 1.665
-32. Fix wxFileConfig behaviour in Unicode mode
+11. Ukrainian translation (locale/uk.po)
+[and other translations that were updated in the trunk as well]
-Note: this must be done a bit differently, w/o wxFileConfig::m_conv!
-CVS: [VS] wxWindows/include/wx fileconf.h,1.39,1.40
-CVS: [VS] wxWindows/src/common fileconf.cpp,1.93,1.94
-CVS: [VS] wxWindows/include/wx strconv.h,1.12,1.13
-CVS: [VS] wxWindows/src/common strconv.cpp,1.71,1.72
-36. Add SetFonts to wxHTML printing classes; SetFonts(a,b,NULL) can be used
-to set default sizes now.
+13. UNICOWS problem in fdrepdlg
-(Do not apply wxHtmlEasyPrinting part of this changes!)
+http://sf.net/tracker/index.php?func=detail&aid=720542&group_id=9863&atid=309863
-Checking in src/html/winpars.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/html/winpars.cpp,v <-- winpars.cpp
-new revision: 1.38; previous revision: 1.37
-Checking in src/html/htmprint.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/html/htmprint.cpp,v <-- htmprint.cpp
-new revision: 1.29; previous revision: 1.28
-cvs diff: [21:30:15] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/src/html
-Checking in samples/html/printing/printing.cpp;
-/pack/cvsroots/wxwindows/wxWindows/samples/html/printing/printing.cpp,v <-- printing.cpp
-new revision: 1.9; previous revision: 1.8
-cvs diff: [21:30:19] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/samples/html/printing
-Checking in include/wx/html/htmldefs.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/html/htmldefs.h,v <-- htmldefs.h
-new revision: 1.8; previous revision: 1.7
-Checking in include/wx/html/htmlwin.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/html/htmlwin.h,v <-- htmlwin.h
-new revision: 1.35; previous revision: 1.34
-Checking in include/wx/html/htmprint.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/html/htmprint.h,v <-- htmprint.h
+Checking in src/msw/fdrepdlg.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/fdrepdlg.cpp,v <-- fdrepdlg.cpp
+new revision: 1.10; previous revision: 1.9
+
+
+15. Fixes for mono bitmaps in wxGTK
+
+http://sf.net/tracker/index.php?func=detail&aid=728768&group_id=9863&atid=309863
+
+Checking in include/wx/gtk/dcmemory.h;
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/gtk/dcmemory.h,v <-- dcmemory.h
new revision: 1.13; previous revision: 1.12
-Checking in include/wx/html/winpars.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/html/winpars.h,v <-- winpars.h
+done
+Checking in src/gtk/dcmemory.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/gtk/dcmemory.cpp,v <-- dcmemory.cpp
+new revision: 1.21; previous revision: 1.20
+done
+
+
+16. Menu accels for items with bitmaps in wxGTK
+
+http://sf.net/tracker/index.php?func=detail&aid=626048&group_id=9863&atid=309863
+
+Checking in src/gtk/menu.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/gtk/menu.cpp,v <-- menu.cpp
+new revision: 1.136; previous revision: 1.135
+
+
+17. Init wxTextBuffer::m_isOpened in ctor
+
+http://sf.net/tracker/index.php?func=detail&aid=736208&group_id=9863&atid=109863
+
+Checking in include/wx/textbuf.h;
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/textbuf.h,v <-- textbuf.h
+new revision: 1.8; previous revision: 1.7
+
+
+20. Bug fix for clicking on a panel not giving focus to it:
+
+http://sf.net/tracker/?func=detail&aid=215436&group_id=9863&atid=109863
+
+Checking in src/common/containr.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/common/containr.cpp,v <-- containr.cpp
new revision: 1.18; previous revision: 1.17
+
+
+21. Fix wxGTK w/ GTK+2 to respect wxDC::SetBackgroundMode and SetTextBackground
+
+Checking in dcclient.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/gtk/dcclient.cpp,v <-- dcclient.cpp
+new revision: 1.170; previous revision: 1.169
+done
+
+
+22. patch [ 619705 ] Fixes wxApp::GetComCtl32Version
+
+Checking in wxWidgets/src/msw/app.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/app.cpp,v <-- app.cpp
+new revision: 1.186; previous revision: 1.185
+done
+
+
+23. Add Raise() to wxDialog and have wxBringWindowToTop only
+call SetWindowPos, so that raising child windows does not
+automatically raise the associated top-level window. For
+binary compatibility, can do a test for top-level-ness in
+wxBringWindowToTop.
+
+See: Bug [ 744199 ] wxBringWindowToTop, child window z-order
+
+Checking in include/wx/msw/dialog.h;
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/msw/dialog.h,v <-- dialog.h
+new revision: 1.34; previous revision: 1.33
+done
+Checking in src/msw/dialog.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/dialog.cpp,v <-- dialog.cpp
+new revision: 1.84; previous revision: 1.83
+done
+Checking in src/msw/window.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/window.cpp,v <-- window.cpp
+new revision: 1.381; previous revision: 1.380
+done
+
+25. wxGenericListCtrl::Refresh() (didn't work at all before)
+
+Checking in include//wx/generic/listctrl.h;
+/pack/cvsroots/wxwindows/wxWidgets/include/wx/generic/listctrl.h,v <-- listctrl.h
+new revision: 1.77; previous revision: 1.76
+Checking in src/generic/listctrl.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/generic/listctrl.cpp,v <-- listctrl.cpp
+new revision: 1.284; previous revision: 1.283
+cvs diff: [13:19:09] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWidgets/include/wx/generic
Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
-new revision: 1.258; previous revision: 1.257
-Checking in docs/latex/wx/htwindow.tex;
-/pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/htwindow.tex,v <-- htwindow.tex
+/pack/cvsroots/wxwindows/wxWidgets/docs/changes.txt,v <-- changes.txt
+new revision: 1.299; previous revision: 1.298
+
+
+27. Fix redistribution of the extra space between sizer items: all extra space
+used to be allocated to the first item which is wrong, it should be divided
+evenly among all of them.
+
+Checking in sizer.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/common/sizer.cpp,v <-- sizer.cpp
+new revision: 1.71; previous revision: 1.70
+
+28. patch [ 771772 ] Crashes when setting icon tooltip longer than 63 characters
+
+Checking in window.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/window.cpp,v <-- window.cpp
+new revision: 1.431; previous revision: 1.430
+
+29. Fix infinite loop in IsDialogMessage when a panel is reparented after
+ creation (as happens with XRC)
+Checking in src/msw/window.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/window.cpp,v <-- window.cpp
+new revision: 1.432; previous revision: 1.431
+
+30. Fix enumerating groups/entries in wxRegConfig under '/':
+
+Checking in src/msw/regconf.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/regconf.cpp,v <-- regconf.cpp
+new revision: 1.48; previous revision: 1.47
+
+31. Cleanup of ZIP charset conversion in Unicode build
+
+Checking in fs_zip.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/common/fs_zip.cpp,v <-- fs_zip.cpp
new revision: 1.27; previous revision: 1.26
-Checking in docs/latex/wx/htwinprs.tex;
-/pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/htwinprs.tex,v <-- htwinprs.tex
-new revision: 1.19; previous revision: 1.18
-Checking in docs/latex/wx/htprint.tex;
-/pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/htprint.tex,v <-- htprint.tex
-new revision: 1.7; previous revision: 1.6
-Checking in docs/latex/wx/htdcrend.tex;
-/pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/htdcrend.tex,v <-- htdcrend.tex
-new revision: 1.8; previous revision: 1.7
+done
+Checking in zipstrm.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/common/zipstrm.cpp,v <-- zipstrm.cpp
+new revision: 1.10; previous revision: 1.9
+done
+
+32. Apply patch [ 866387 ] wxGenericDirCtrl does not accept multiple wildcards
+
+Checking in src/generic/dirctrlg.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/generic/dirctrlg.cpp,v <-- dirctrlg.cpp
+new revision: 1.81; previous revision: 1.80
+
+33. Apply patch [ 873021 ] Bug fix for MSW wxComboBox
+
+wxComboBox::GetValue within a wxEVT_COMMAND_TEXT_UPDATED event
+should now pass the correct value even if the handler for
+wxEVT_COMMAND_COMBOBOX_SELECTED changed the selection.
+
+Checking in src/msw/combobox.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/combobox.cpp,v <-- combobox.cpp
+new revision: 1.72; previous revision: 1.71
+done
+
+34. Apply patch [ 851052 ] [msw] Clipboard: Allow automatic format conversionsChecking in clipbrd.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/clipbrd.cpp,v <-- clipbrd.cpp
+new revision: 1.54; previous revision: 1.53
+done
+
+35. [ 882201 ] wxXPMDecoder doesn't always patch magenta
+
+Checking in xpmdecod.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/common/xpmdecod.cpp,v <-- xpmdecod.cpp
+new revision: 1.32; previous revision: 1.31
+done
+
+36. [ 892580, 892582 ] Fix of variable declaration in wxApp::Yield().
+
+Checking in src/motif/app.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/motif/app.cpp,v <-- app.cpp
+new revision: 1.82; previous revision: 1.81
+done
+Checking in src/x11/app.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/x11/app.cpp,v <-- app.cpp
+new revision: 1.94; previous revision: 1.93
+done
+
+37. no-remap system option, and tool centring
+Checking in src/msw/tbar95.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/msw/tbar95.cpp,v <-- tbar95.cpp
+new revision: 1.121; previous revision: 1.120
+done
+
+
+38. Implement wxBitmapButton::DoGetBestSize
+
+Checking in include/wx/gtk/bmpbuttn.h;
+/pack/cvsroots/wxwidgets/wxWidgets/include/wx/gtk/bmpbuttn.h,v <-- bmpbuttn.h
+new revision: 1.24; previous revision: 1.23
+done
+Checking in src/gtk/bmpbuttn.cpp;
+/pack/cvsroots/wxwidgets/wxWidgets/src/gtk/bmpbuttn.cpp,v <-- bmpbuttn.cpp
+new revision: 1.46; previous revision: 1.45
+done
+Checking in include/wx/msw/bmpbuttn.h;
+/pack/cvsroots/wxwidgets/wxWidgets/include/wx/msw/bmpbuttn.h,v <-- bmpbuttn.h
+new revision: 1.12; previous revision: 1.11
+done
+Checking in src/msw/bmpbuttn.cpp;
+/pack/cvsroots/wxwidgets/wxWidgets/src/msw/bmpbuttn.cpp,v <-- bmpbuttn.cpp
+new revision: 1.45; previous revision: 1.44
+done
+Checking in include/wx/mac/bmpbuttn.h;
+/pack/cvsroots/wxwidgets/wxWidgets/include/wx/mac/bmpbuttn.h,v <-- bmpbuttn.h
+new revision: 1.10; previous revision: 1.9
+done
+Checking in src/mac/bmpbuttn.cpp;
+/pack/cvsroots/wxwidgets/wxWidgets/src/mac/bmpbuttn.cpp,v <-- bmpbuttn.cpp
+new revision: 1.26; previous revision: 1.25
+done
+
+39. Fix for files opened by another app in wxFileName::GetModificationTime():
+
+Checking in src/common/filename.cpp;
+/pack/cvsroots/wxwindows/wxWidgets/src/common/filename.cpp,v <-- filename.cpp
+new revision: 1.131; previous revision: 1.130
+
+=======
+
+
+TODO for 2.4 (items that are not backports)
+===========================================
+
+1. Add uxtheme.cpp to CW for Windows project file.
-37. Backport wxLANGUAGE_CHINESE_TRADITIONAL fix in src/common/intl.cpp
- (replace zh_CN with zh_TW)
+2. Test Mac port with configure and CW.
- I think this may already have been applied (JS)
+3. Test popup window and border issues.