1. HAVE_EXPLICIT fix: http://sf.net/tracker/index.php?func=detail&aid=651314&group_id=9863&atid=109863 Checking in defs.h; /pack/cvsroots/wxwindows/wxWindows/include/wx/defs.h,v <-- defs.h new revision: 1.324; previous revision: 1.323 done 2. wxCheckListBox::Check() event sending fix: http://sf.net/tracker/index.php?func=detail&aid=651140&group_id=9863&atid=109863 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 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 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 new revision: 1.29; previous revision: 1.28 done 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 Checking in gtk/toplevel.cpp; /pack/cvsroots/wxwindows/wxWindows/src/gtk/toplevel.cpp,v <-- toplevel.cpp new revision: 1.37; previous revision: 1.36 done Checking in unix/utilsx11.cpp; /pack/cvsroots/wxwindows/wxWindows/src/unix/utilsx11.cpp,v <-- utilsx11.cpp new revision: 1.9; previous revision: 1.8 done 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 done 10. Fixes for compilation with OpenWatcom http://sf.net/tracker/index.php?func=detail&aid=665959&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 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 docs/changes.txt; /pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt new revision: 1.234; previous revision: 1.233 done 13. wxMSW::wxStaticText::GetBestSize() was wrong by '&' width http://sf.net/tracker/index.php?func=detail&aid=667324&group_id=9863&atid=109863 Checking in docs/changes.txt; /pack/cvsroots/wxwindows/wxWindows/docs/changes.txt,v <-- changes.txt new revision: 1.235; previous revision: 1.234 done src/msw/stattext.cpp: 1.33 -> 1.35 14. wxMSW::wxFrame::Maximize(FALSE) would maximize the window if called before showing it http://sf.net/tracker/index.php?func=detail&aid=667665&group_id=9863&atid=109863 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 15. wxCondition docs updates (just change true/false back to TRUE/FALSE) Checking in docs/latex/wx/conditn.tex; /pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/conditn.tex,v <-- conditn.tex new revision: 1.11; previous revision: 1.10 done 15. XRC fixes for and relative file names 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 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 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 done 20. Fix for wxProgressDialog::Update() signature: Checking in docs/latex/wx/progdlg.tex; /pack/cvsroots/wxwindows/wxWindows/docs/latex/wx/progdlg.tex,v <-- progdlg.tex new revision: 1.10; previous revision: 1.9 done 21. [ 668155 ] Refresh problem when msgbox is shown (wxUniversal) https://sourceforge.net/tracker/index.php?func=detail&aid=668155&group_id=9863&atid=309863 Index: e:/dev/wxWindows/src/univ/winuniv.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/univ/winuniv.cpp,v retrieving revision 1.35 diff -u -2 -r1.35 winuniv.cpp --- e:/dev/wxWindows/src/univ/winuniv.cpp 2002/12/09 10:19:08 1.35 +++ e:/dev/wxWindows/src/univ/winuniv.cpp 2003/01/14 21:24:21 @@ -392,4 +392,17 @@ wxWindowNative::Refresh(eraseBackground, &rectWin); + + // Refresh all sub controls if any. + wxWindowList::Node *node = GetChildren().GetFirst(); + while ( node ) + { + wxWindow *win = node->GetData(); + // Only refresh sub controls when it is visible + // and when it is in the update region. + if(win->IsShown() && wxRegion(rectWin).Contains(win->GetRect()) != wxOutRegion) + win->Refresh(eraseBackground, &rectWin); + + node = node->GetNext(); + } } 22. "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) 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! 23. Use GNOME2's /usr/share/pixmaps/document-icons in wxMimeTypesManager Checking in mimetype.cpp; /pack/cvsroots/wxwindows/wxWindows/src/unix/mimetype.cpp,v <-- mimetype.cpp new revision: 1.29; previous revision: 1.28 done 24. Fix SetScrollbars bug. You know the one :-) Checking in src/common/wincmn.cpp; /pack/cvsroots/wxwindows/wxWindows/src/common/wincmn.cpp,v <-- wincmn.cpp new revision: 1.129; previous revision: 1.128 done Checking in src/generic/scrlwing.cpp; /pack/cvsroots/wxwindows/wxWindows/src/generic/scrlwing.cpp,v <-- scrlwing.cpp new revision: 1.35; previous revision: 1.34 done Checking in src/gtk/scrolwin.cpp; /pack/cvsroots/wxwindows/wxWindows/src/gtk/scrolwin.cpp,v <-- scrolwin.cpp new revision: 1.27; previous revision: 1.26 done 26. Fix Unicode + .wxr Using an #if wxUSE_UNICODE in include/wx/wxexpr.h, safer for binary compatibility. 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 done 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 done 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 done 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 done 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 done 27. Fix assert (and crash in debug) in wxFileConfigGroup::DeleteSubgroupByName Checking in src/common/fileconf.cpp; /pack/cvsroots/wxwindows/wxWindows/src/common/fileconf.cpp,v <-- fileconf.cpp new revision: 1.93; previous revision: 1.92 done 28. Set orientation for scrolbar events Checking in src/msw/scrolbar.cpp; /pack/cvsroots/wxwindows/wxWindows/src/msw/scrolbar.cpp,v <-- scrolbar.cpp new revision: 1.24; previous revision: 1.23 done 29. Patch 664399: wxButton default size should not be adjusted (wxUniv), cures overlapping buttons on e.g. wxWizard sample. Index: src/univ/button.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/univ/button.cpp,v retrieving revision 1.15 diff -r1.15 button.cpp 116,117c116,117 < s_sizeBtn.x = 8*dc.GetCharWidth(); < s_sizeBtn.y = (11*dc.GetCharHeight())/10 + 2; --- > s_sizeBtn.x = dc.GetCharWidth()*10 + 2; > s_sizeBtn.y = dc.GetCharHeight()*11/10 + 2; 139,149c139,140 < // for compatibility with other ports, the buttons default size is never < // less than the standard one, but not when display not PDAs. < if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) < { < if ( !(GetWindowStyle() & wxBU_EXACTFIT) ) < { < wxSize szDef = GetDefaultSize(); < if ( width < szDef.x ) < width = szDef.x; < } < } --- > // The default size should not be adjusted, so the code is moved into the > // renderer. This is conceptual wrong but currently the only solution Index: src/univ/themes/win32.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/univ/themes/win32.cpp,v retrieving revision 1.55 diff -r1.55 win32.cpp 3989a3990,4001 > // for compatibility with other ports, the buttons default size is never > // less than the standard one, but not when display not PDAs. > if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) > { > if ( !(window->GetWindowStyle() & wxBU_EXACTFIT) ) > { > wxSize szDef = wxButton::GetDefaultSize(); > if ( size->x < szDef.x ) > size->x = szDef.x; > } > } > 30. [wxMotif] Coloured stipples, don't use stipples in DoDrawText Checking in src/motif/dcclient.cpp; /pack/cvsroots/wxwindows/wxWindows/src/motif/dcclient.cpp,v <-- dcclient.cpp new revision: 1.47; previous revision: 1.46 done 31. [wxHTML] Fix parsing of CDATA tags and ignore