fix (harmless) assert in virtual list control under Vista

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-04 17:05:29 +00:00
parent d9bbb2d877
commit 19def5e7e6
2 changed files with 8 additions and 4 deletions

View File

@@ -104,6 +104,7 @@ wxMSW:
- Fixed version script problems when using configure with cygwin/mingw32. - Fixed version script problems when using configure with cygwin/mingw32.
- Use system default paper size for printing instead of A4. - Use system default paper size for printing instead of A4.
- Fix (harmless) assert in virtual list control under Vista
- Fix colours when converting wxBitmap with alpha to wxImage (nusi). - Fix colours when converting wxBitmap with alpha to wxImage (nusi).
wxGTK: wxGTK:

View File

@@ -2316,10 +2316,13 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
} }
#endif // NM_CUSTOMDRAW #endif // NM_CUSTOMDRAW
// a little dose of healthy paranoia: as we never use // even though we never use LVM_SETCALLBACKMASK, we still
// LVM_SETCALLBACKMASK we're not supposed to get these ones // can get messages with LVIF_STATE in lvi.mask under Vista
wxASSERT_MSG( !(lvi.mask & LVIF_STATE), if ( lvi.mask & LVIF_STATE )
_T("we don't support state callbacks yet!") ); {
// we don't have anything to return from here...
lvi.stateMask = 0;
}
return true; return true;
} }