-1. HAVE_EXPLICIT fix:
+1. wxFrame support in wxrcedit
-http://sf.net/tracker/index.php?func=detail&aid=651314&group_id=9863&atid=109863
+http://sourceforge.net/tracker/index.php?func=detail&aid=648659&group_id=9863&atid=309863
-Checking in defs.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/defs.h,v <-- defs.h
-new revision: 1.324; previous revision: 1.323
-done
+[Is this worth applying if wxrcedit is not supported? - VS]
+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
+CVS: [RR] wxWindows/src/gtk minifram.cpp,1.29,1.30
+ (not sure about minifram.cpp: must be checked for binary compatibility - VS)
-2. wxCheckListBox::Check() event sending fix:
+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!
-http://sf.net/tracker/index.php?func=detail&aid=651140&group_id=9863&atid=109863
+3. Add Windows XP manifests to wx.rc
-Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
-new revision: 1.221; previous revision: 1.220
-done
-cvs diff: [23:41:08] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/docs
-Checking in docs/latex/wx/checklst.tex;
-/pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/checklst.tex,v <-- checklst.tex
-new revision: 1.8; previous revision: 1.7
+RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/msw/wx.manifest,v
done
-Checking in src/msw/checklst.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/checklst.cpp,v <-- checklst.cpp
-new revision: 1.35; previous revision: 1.34
+Checking in wx.manifest;
+/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/wx.manifest,v <-- wx.manifest
+initial revision: 1.1
done
-
-
-
-3. imagpng.cpp compilation fix for Watcom 11
-
-http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863
-
-Checking in src/common/imagpng.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/imagpng.cpp,v <-- imagpng.cpp
+Checking in wx.rc;
+/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/wx.rc,v <-- wx.rc
new revision: 1.29; previous revision: 1.28
done
+4. Fix wxLocale::Init with Unicode-only languages (does it work with BCC?)
-
-4. wxCaret::SetSize() bug fix
-
-http://sf.net/tracker/index.php?func=detail&aid=659209&group_id=9863&atid=109863
-
-Checking in src/msw/caret.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/caret.cpp,v <-- caret.cpp
-new revision: 1.15; previous revision: 1.14
-done
-cvs diff: [01:41:47] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/src/msw
-Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
-new revision: 1.223; previous revision: 1.222
-done
-
-
-
-5 wxTR_MULTIPLE and wxTR_EDIT_LABELS
-
-http://sf.net/tracker/index.php?func=detail&aid=622089&group_id=9863&atid=109863
-
-Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
-new revision: 1.224; previous revision: 1.223
-done
-cvs diff: [21:21:39] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/docs
-Checking in src/msw/treectrl.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/treectrl.cpp,v <-- treectrl.cpp
-new revision: 1.136; previous revision: 1.135
-done
-
-
-
-6 Improved X11 ShowFullScreen (later, maybe 2.4.2?)
-
-RCS file: /pack/cvsroots/wxwindows/wxWindows/src/gtk/toplevel.cpp,v
-retrieving revision 1.34
-retrieving revision 1.35
-RCS file: /pack/cvsroots/wxwindows/wxWindows/src/unix/utilsx11.cpp,v
-retrieving revision 1.5
-retrieving revision 1.6
-RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/unix/utilsx11.h,v
-retrieving revision 1.1
-retrieving revision 1.2
-
-
-
-7 Fixes to wxrc compiler
-
-wxWindows/contrib/utils/wxrc/wxrc.cpp revision 1.23
-Log: 1) fixed compilation of wxBitmap, wxIcon toplevel nodes
- 2) fixed wxrc when using -o dirname/filename
-
-
-
-8 wxFrame support in wxrcedit
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=648659&group_id=9863&atid=309863
-
-
-9 Use ES_DISABLENOSCROLL to work around the vertical scrollbar bug in
- wxTE_RICH2 text control.
-
-Checking in src/msw/textctrl.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/textctrl.cpp,v <-- textctrl.cpp
-new revision: 1.157; previous revision: 1.156
+Checking in intl.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/common/intl.cpp,v <-- intl.cpp
+new revision: 1.93; previous revision: 1.92
done
-10. Fixes for compilation with OpenWatcom
+5. proper AcceptsFocus() implementation for containers
-http://sf.net/tracker/index.php?func=detail&aid=665959&group_id=9863&atid=309863
+http://sf.net/tracker/index.php?func=detail&aid=718913&group_id=9863&atid=309863
-Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
-new revision: 1.230; previous revision: 1.229
-done
-Checking in src/common/imagjpeg.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/imagjpeg.cpp,v <-- imagjpeg.cpp
-new revision: 1.31; previous revision: 1.30
-done
-Checking in include/wx/msw/missing.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/missing.h,v <-- missing.h
-new revision: 1.8; previous revision: 1.7
-done
-Checking in include/wx/msw/setup0.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/setup0.h,v <-- setup0.h
-new revision: 1.128; previous revision: 1.127
-done
+Checking in include/wx/containr.h;
+/pack/cvsroots/wxwindows/wxWindows/include/wx/containr.h,v <-- containr.h
+new revision: 1.10; previous revision: 1.9
+Checking in src/common/containr.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/common/containr.cpp,v <-- containr.cpp
+new revision: 1.17; previous revision: 1.16
-11 wxMotif filedialog/wildcard corrections
+6. fixes for user dash wxPens handling
- Documented wxMotif filedialog limitations WRT wildcard syntax.
-Modified filedialog to either extract the wildcard (if only one wildcard
-is present) or assert (if more than one is present).
+http://sf.net/tracker/index.php?func=detail&aid=717736&group_id=9863&atid=309863
-Checking in docs/latex/wx/filedlg.tex;
-/pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/filedlg.tex,v <-- filedlg.tex
-new revision: 1.14; previous revision: 1.13
-done
-Checking in samples/dialogs/dialogs.cpp;
-/pack/cvsroots/wxwindows/wxWindows/samples/dialogs/dialogs.cpp,v <-- dialogs.cpp
-new revision: 1.88; previous revision: 1.87
-done
-cvs diff: [15:36:24] waiting for cvs's lock in /pack/cvsroots/wxwindows/wxWindows/docs/latex/wx
-Checking in src/motif/filedlg.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/motif/filedlg.cpp,v <-- filedlg.cpp
+Checking in include/wx/msw/pen.h;
+/pack/cvsroots/wxwindows/wxWindows/include/wx/msw/pen.h,v <-- pen.h
new revision: 1.16; previous revision: 1.15
-
-12. wxStopWatch::Start() didn't resume it contrary to the docs
-
-Checking in src/common/timercmn.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/timercmn.cpp,v <-- timercmn.cpp
-new revision: 1.64; previous revision: 1.63
-done
+Checking in src/msw/pen.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/msw/pen.cpp,v <-- pen.cpp
+new revision: 1.20; previous revision: 1.19
+Checking in src/gtk/pen.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/gtk/pen.cpp,v <-- pen.cpp
+new revision: 1.23; previous revision: 1.22
+Checking in samples/drawing/drawing.cpp;
+/pack/cvsroots/wxwindows/wxWindows/samples/drawing/drawing.cpp,v <-- drawing.cpp
+new revision: 1.67; previous revision: 1.66
Checking in docs/changes.txt;
/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
-new revision: 1.234; previous revision: 1.233
-done
+new revision: 1.266; previous revision: 1.265
-13. wxMSW::wxStaticText::GetBestSize() was wrong by '&' width
+7. use one gdk_draw_lines() call instead of multiple gdk_draw_line() ones
-http://sf.net/tracker/index.php?func=detail&aid=667324&group_id=9863&atid=109863
+http://sf.net/tracker/index.php?func=detail&aid=717012&group_id=9863&atid=309863
-Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
-new revision: 1.235; previous revision: 1.234
-done
+Checking in src/gtk/dcclient.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/gtk/dcclient.cpp,v <-- dcclient.cpp
+new revision: 1.169; previous revision: 1.168
-src/msw/stattext.cpp: 1.33 -> 1.35
-14. wxMSW::wxFrame::Maximize(FALSE) would maximize the window if called before
- showing it
+8. UnixWare compilation fixes:
-http://sf.net/tracker/index.php?func=detail&aid=667665&group_id=9863&atid=109863
+Don't forget to rerun autoconf to regenerate configure!
-Checking in src/msw/toplevel.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/msw/toplevel.cpp,v <-- toplevel.cpp
-new revision: 1.44; previous revision: 1.43
-done
-Checking in docs/changes.txt;
-/pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt
-new revision: 1.236; previous revision: 1.235
-done
+Checking in configure.in;
+/pack/cvsroots/wxwindows/wxWindows/configure.in,v <-- configure.in
+new revision: 1.664; previous revision: 1.663
+Checking in setup.h.in;
+/pack/cvsroots/wxwindows/wxWindows/setup.h.in,v <-- setup.h.in
+new revision: 1.111; previous revision: 1.110
+Checking in src/unix/gsocket.c;
+/pack/cvsroots/wxwindows/wxWindows/src/unix/gsocket.c,v <-- gsocket.c
+new revision: 1.72; previous revision: 1.71
+9. wxSemaphore methods returned incorrect values:
-15. XRC fixes for <object_ref> and relative file names
+Checking in src/msw/thread.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/msw/thread.cpp,v <-- thread.cpp
+new revision: 1.62; previous revision: 1.61
+Checking in src/unix/threadpsx.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/unix/threadpsx.cpp,v <-- threadpsx.cpp
+new revision: 1.62; previous revision: 1.61
-Must be modified to be binary compatible before backporting!
+10. Unix/OpenGL build fix:
-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
-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
-done
-
-
-16. Fixes for wxLocale::Init and Borland C++
-
-(document it in changes.txt)
-
-Checking in intl.cpp;
-/pack/cvsroots/wxwindows/wxWindows/src/common/intl.cpp,v <-- intl.cpp
-new revision: 1.87; previous revision: 1.86
-done
+Don't forget to rerun autoconf to regenerate configure!
+Checking in configure.in;
+/pack/cvsroots/wxwindows/wxWindows/configure.in,v <-- configure.in
+new revision: 1.666; previous revision: 1.665
-17. XRC: better wxToolBar handler
+11. Ukrainian translation (locale/uk.po)
+[and other translations that were updated in the trunk as well]
-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).
+12. Fix wxZipFSHandler behaviour when used with relative filenames with ..
-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
-done
-
-
-18. Patch [669508] Define Win32 symbols for CW in platform.h
-
-Checking in platform.h;
-/pack/cvsroots/wxwindows/wxWindows/include/wx/platform.h,v <-- platform.h
-new revision: 1.13; previous revision: 1.12
-done
-
-
-19. Patch [669503] Patch to CW7 wxMSW project file
-
-Checking in wxWindowsW7.xml;
-/pack/cvsroots/wxwindows/wxWindows/src/wxWindowsW7.xml,v <-- wxWindowsW7.xml
-new revision: 1.6; previous revision: 1.5
+Checking in fs_zip.cpp;
+/pack/cvsroots/wxwindows/wxWindows/src/common/fs_zip.cpp,v <-- fs_zip.cpp
+new revision: 1.22; previous revision: 1.21
done
-