X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/937013e0fd914d4c42f9f5ec98da665986b93dfa..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/listctrl.cpp diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 6f22017cff..cdc5123074 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -279,7 +279,7 @@ wxEND_HANDLERS_TABLE() wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) /* - TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) + TODO : Expose more information of a list's layout etc. via appropriate objects (a la NotebookPageInfo) */ #else IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) @@ -2821,8 +2821,10 @@ void wxListCtrl::OnPaint(wxPaintEvent& event) int numCols = GetColumnCount(); int* indexArray = new int[numCols]; - BOOL rv = ListView_GetColumnOrderArray( GetHwnd(), numCols, indexArray ); - wxASSERT_MSG( rv == TRUE, _T("invalid column index array in OnPaint()") ); + if ( !ListView_GetColumnOrderArray( GetHwnd(), numCols, indexArray) ) + { + wxFAIL_MSG( _T("invalid column index array in OnPaint()") ); + } int x = itemRect.GetX(); for (int col = 0; col < numCols; col++)