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
This commit is contained in:
Vadim Zeitlin
2008-03-09 12:59:26 +00:00
parent 4b506b8b34
commit c0e61743de
2 changed files with 6 additions and 4 deletions

View File

@@ -891,8 +891,9 @@ void GridFrame::OnShowSelection(wxCommandEvent& WXUNUSED(event))
single = _T("column"); single = _T("column");
} }
const wxArrayInt sels(rows ? grid->GetSelectedRows() // NB: extra parentheses needed to avoid bcc 5.82 errors
: grid->GetSelectedCols()); const wxArrayInt sels((rows ? grid->GetSelectedRows()
: grid->GetSelectedCols()));
size_t count = sels.size(); size_t count = sels.size();
wxLogMessage(_T("%lu %s selected:"), wxLogMessage(_T("%lu %s selected:"),
(unsigned long)count, plural); (unsigned long)count, plural);

View File

@@ -10660,8 +10660,9 @@ wxCoord wxGrid::CalcColOrRowLabelAreaMinSize(bool column)
for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ ) for ( int rowOrCol = 0; rowOrCol < numRowsOrCols; rowOrCol++ )
{ {
lines.Clear(); lines.Clear();
StringToLines(calcRows ? GetRowLabelValue(rowOrCol) // NB: extra parentheses needed to avoid bcc 5.82 compilation errors
: GetColLabelValue(rowOrCol), StringToLines((calcRows ? GetRowLabelValue(rowOrCol)
: GetColLabelValue(rowOrCol)),
lines); lines);
long w, h; long w, h;