From c0e61743de35c214d434e84d00dbcc9e1392bc6a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Mar 2008 12:59:26 +0000 Subject: [PATCH] use extra parentheses to fix Borland problems with operator?: git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@52411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/grid/griddemo.cpp | 5 +++-- src/generic/grid.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp index 387fb57614..a58bc8d801 100644 --- a/samples/grid/griddemo.cpp +++ b/samples/grid/griddemo.cpp @@ -891,8 +891,9 @@ void GridFrame::OnShowSelection(wxCommandEvent& WXUNUSED(event)) single = _T("column"); } - const wxArrayInt sels(rows ? grid->GetSelectedRows() - : grid->GetSelectedCols()); + // NB: extra parentheses needed to avoid bcc 5.82 errors + const wxArrayInt sels((rows ? grid->GetSelectedRows() + : grid->GetSelectedCols())); size_t count = sels.size(); wxLogMessage(_T("%lu %s selected:"), (unsigned long)count, plural); diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index c3752751b5..da44fbb47f 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -10660,8 +10660,9 @@ wxCoord wxGrid::CalcColOrRowLabelAreaMinSize(bool column) for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ ) { lines.Clear(); - StringToLines(calcRows ? GetRowLabelValue(rowOrCol) - : GetColLabelValue(rowOrCol), + // NB: extra parentheses needed to avoid bcc 5.82 compilation errors + StringToLines((calcRows ? GetRowLabelValue(rowOrCol) + : GetColLabelValue(rowOrCol)), lines); long w, h;