///////////////////////////////////////////////////////////////////////////
-// Name: grid.cpp
+// Name: generic/grid.cpp
// Purpose: wxGrid and related classes
// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
// Modified by:
#include "wx/grid.h"
-
// ----------------------------------------------------------------------------
// array classes
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridRowOrColAttrData
{
public:
+ // empty ctor to suppress warnings
+ wxGridRowOrColAttrData() { }
~wxGridRowOrColAttrData();
void SetAttr(wxGridCellAttr *attr, int rowOrCol);
static size_t gs_nAttrCacheMisses = 0;
#endif // DEBUG_ATTR_CACHE
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
wxGridCellCoords wxGridNoCellCoords( -1, -1 );
wxRect wxGridNoCellRect( -1, -1, -1, -1 );
// TODO: fixed so far - make configurable later (and also different for x/y)
static const size_t GRID_SCROLL_LINE = 10;
+// the size of hash tables used a bit everywhere (the max number of elements
+// in these hash tables is the number of rows/columns)
+static const int GRID_HASH_SIZE = 100;
+
// ============================================================================
// implementation
// ============================================================================
#if WXGRID_DRAW_LINES
m_owner->DrawAllGridLines( dc, reg );
#endif
+ m_owner->DrawHighlight( dc );
}
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
-void wxGridWindow::OnEraseBackground(wxEraseEvent&)
-{ }
-
-
+// We are trapping erase background events to reduce flicker under MSW
+// and GTK but this can leave junk in the space beyond the last row and
+// col. So here we paint these spaces if they are visible.
+//
+void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+{
+ int cw, ch;
+ GetClientSize( &cw, &ch );
+
+ int right, bottom;
+ m_owner->CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+ wxRect rightRect;
+ rightRect = m_owner->CellToRect( 0, m_owner->GetNumberCols()-1 );
+
+ wxRect bottomRect;
+ bottomRect = m_owner->CellToRect( m_owner->GetNumberRows()-1, 0 );
+
+ if ( right > rightRect.GetRight() || bottom > bottomRect.GetBottom() )
+ {
+ int left, top;
+ m_owner->CalcUnscrolledPosition( 0, 0, &left, &top );
+
+ wxClientDC dc( this );
+ m_owner->PrepareDC( dc );
+ dc.SetBrush( wxBrush(m_owner->GetDefaultCellBackgroundColour(), wxSOLID) );
+ dc.SetPen( *wxTRANSPARENT_PEN );
+
+ if ( right > rightRect.GetRight() )
+ dc.DrawRectangle( rightRect.GetRight()+1, top, right - rightRect.GetRight(), ch );
+
+ if ( bottom > bottomRect.GetBottom() )
+ dc.DrawRectangle( left, bottomRect.GetBottom()+1, cw, bottom - bottomRect.GetBottom() );
+ }
+}
//////////////////////////////////////////////////////////////////////
const wxSize& size,
long style,
const wxString& name )
- : wxScrolledWindow( parent, id, pos, size, style, name )
+ : wxScrolledWindow( parent, id, pos, size, style, name ),
+ m_colMinWidths(wxKEY_INTEGER, GRID_HASH_SIZE)
{
Create();
}
void wxGrid::Init()
{
- int i;
-
if ( m_numRows <= 0 )
m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
m_defaultRowHeight += 4;
#endif
- m_rowHeights.Alloc( m_numRows );
- m_rowBottoms.Alloc( m_numRows );
- int rowBottom = 0;
- for ( i = 0; i < m_numRows; i++ )
- {
- m_rowHeights.Add( m_defaultRowHeight );
- rowBottom += m_defaultRowHeight;
- m_rowBottoms.Add( rowBottom );
- }
-
- m_colWidths.Alloc( m_numCols );
- m_colRights.Alloc( m_numCols );
- int colRight = 0;
- for ( i = 0; i < m_numCols; i++ )
- {
- m_colWidths.Add( m_defaultColWidth );
- colRight += m_defaultColWidth;
- m_colRights.Add( colRight );
- }
-
// Set default cell attributes
m_defaultCellAttr->SetFont(GetFont());
m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
m_inOnKeyDown = FALSE;
m_batchCount = 0;
+}
+
+// ----------------------------------------------------------------------------
+// the idea is to call these functions only when necessary because they create
+// quite big arrays which eat memory mostly unnecessary - in particular, if
+// default widths/heights are used for all rows/columns, we may not use these
+// arrays at all
+//
+// with some extra code, it should be possible to only store the
+// widths/heights different from default ones but this will be done later...
+// ----------------------------------------------------------------------------
+
+void wxGrid::InitRowHeights()
+{
+ m_rowHeights.Empty();
+ m_rowBottoms.Empty();
+
+ m_rowHeights.Alloc( m_numRows );
+ m_rowBottoms.Alloc( m_numRows );
+ int rowBottom = 0;
+ for ( int i = 0; i < m_numRows; i++ )
+ {
+ m_rowHeights.Add( m_defaultRowHeight );
+ rowBottom += m_defaultRowHeight;
+ m_rowBottoms.Add( rowBottom );
+ }
}
+void wxGrid::InitColWidths()
+{
+ m_colWidths.Empty();
+ m_colRights.Empty();
+
+ m_colWidths.Alloc( m_numCols );
+ m_colRights.Alloc( m_numCols );
+ int colRight = 0;
+ for ( int i = 0; i < m_numCols; i++ )
+ {
+ m_colWidths.Add( m_defaultColWidth );
+ colRight += m_defaultColWidth;
+ m_colRights.Add( colRight );
+ }
+}
+
+int wxGrid::GetColWidth(int col) const
+{
+ return m_colWidths.IsEmpty() ? m_defaultColWidth : m_colWidths[col];
+}
+
+int wxGrid::GetColLeft(int col) const
+{
+ return m_colRights.IsEmpty() ? col * m_defaultColWidth
+ : m_colRights[col] - m_colWidths[col];
+}
+
+int wxGrid::GetColRight(int col) const
+{
+ return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth
+ : m_colRights[col];
+}
+
+int wxGrid::GetRowHeight(int row) const
+{
+ return m_rowHeights.IsEmpty() ? m_defaultRowHeight : m_rowHeights[row];
+}
+
+int wxGrid::GetRowTop(int row) const
+{
+ return m_rowBottoms.IsEmpty() ? row * m_defaultRowHeight
+ : m_rowBottoms[row] - m_rowHeights[row];
+}
+
+int wxGrid::GetRowBottom(int row) const
+{
+ return m_rowBottoms.IsEmpty() ? (row + 1) * m_defaultRowHeight
+ : m_rowBottoms[row];
+}
void wxGrid::CalcDimensions()
{
if ( m_numRows > 0 && m_numCols > 0 )
{
- int right = m_colRights[ m_numCols-1 ] + 50;
- int bottom = m_rowBottoms[ m_numRows-1 ] + 50;
+ int right = GetColRight( m_numCols-1 ) + 50;
+ int bottom = GetRowBottom( m_numRows-1 ) + 50;
// TODO: restore the scroll position that we had before sizing
//
{
int i;
+ // if we were using the default widths/heights so far, we must change them
+ // now
+ if ( m_colWidths.IsEmpty() )
+ {
+ InitColWidths();
+ }
+
+ if ( m_rowHeights.IsEmpty() )
+ {
+ InitRowHeights();
+ }
+
switch ( msg.GetId() )
{
case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
// find the row labels within these bounds
//
int row;
- int rowTop;
for ( row = 0; row < m_numRows; row++ )
{
- if ( m_rowBottoms[row] < top ) continue;
+ if ( GetRowBottom(row) < top )
+ continue;
- rowTop = m_rowBottoms[row] - m_rowHeights[row];
- if ( rowTop > bottom ) break;
+ if ( GetRowTop(row) > bottom )
+ break;
m_rowLabelsExposed.Add( row );
}
// find the cells within these bounds
//
int col;
- int colLeft;
for ( col = 0; col < m_numCols; col++ )
{
- if ( m_colRights[col] < left ) continue;
+ if ( GetColRight(col) < left )
+ continue;
- colLeft = m_colRights[col] - m_colWidths[col];
- if ( colLeft > right ) break;
+ if ( GetColLeft(col) > right )
+ break;
m_colLabelsExposed.Add( col );
}
// find the cells within these bounds
//
int row, col;
- int colLeft, rowTop;
for ( row = 0; row < m_numRows; row++ )
{
- if ( m_rowBottoms[row] <= top ) continue;
+ if ( GetRowBottom(row) <= top )
+ continue;
- rowTop = m_rowBottoms[row] - m_rowHeights[row];
- if ( rowTop > bottom ) break;
+ if ( GetRowTop(row) > bottom )
+ break;
m_rowsExposed.Add( row );
for ( col = 0; col < m_numCols; col++ )
{
- if ( m_colRights[col] <= left ) continue;
+ if ( GetColRight(col) <= left )
+ continue;
- colLeft = m_colRights[col] - m_colWidths[col];
- if ( colLeft > right ) break;
+ if ( GetColLeft(col) > right )
+ break;
- if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) m_colsExposed.Add( col );
+ if ( m_colsExposed.Index( col ) == wxNOT_FOUND )
+ m_colsExposed.Add( col );
m_cellsExposed.Add( wxGridCellCoords( row, col ) );
}
}
- iter++ ;
+ iter++;
}
}
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- y = wxMax( y,
- m_rowBottoms[m_dragRowOrCol] -
- m_rowHeights[m_dragRowOrCol] +
- WXGRID_MIN_ROW_HEIGHT );
+ y = wxMax( y, GetRowTop(m_dragRowOrCol) + WXGRID_MIN_ROW_HEIGHT );
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- x = wxMax( x,
- m_colRights[m_dragRowOrCol] -
- m_colWidths[m_dragRowOrCol] +
- WXGRID_MIN_COL_WIDTH );
+
+ x = wxMax( x, GetColLeft(m_dragRowOrCol) +
+ GetColMinimalWidth(m_dragRowOrCol));
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- y = wxMax( y,
- m_rowBottoms[m_dragRowOrCol] -
- m_rowHeights[m_dragRowOrCol] +
- WXGRID_MIN_ROW_HEIGHT );
+ y = wxMax( y, GetRowTop(m_dragRowOrCol) + WXGRID_MIN_ROW_HEIGHT );
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- x = wxMax( x,
- m_colRights[m_dragRowOrCol] -
- m_colWidths[m_dragRowOrCol] + WXGRID_MIN_COL_WIDTH );
+ x = wxMax( x, GetColLeft(m_dragRowOrCol) +
+ GetColMinimalWidth(m_dragRowOrCol) );
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
HideCellEditControl();
- int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol];
+ int rowTop = GetRowTop(m_dragRowOrCol);
SetRowSize( m_dragRowOrCol,
wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
HideCellEditControl();
- int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol];
+ int colLeft = GetColLeft(m_dragRowOrCol);
SetColSize( m_dragRowOrCol,
- wxMax( m_dragLastPos - colLeft, WXGRID_MIN_COL_WIDTH ) );
+ wxMax( m_dragLastPos - colLeft,
+ GetColMinimalWidth(m_dragRowOrCol) ) );
if ( !GetBatchCount() )
{
attr->GetEditor()->StartingKey(event);
attr->DecRef();
}
+ else
+ {
+ // let others process char events for readonly cells
+ event.Skip();
+ }
break;
}
}
int row = coords.GetRow();
int col = coords.GetCol();
- if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
// we draw the cell border ourselves
bool isCurrent = coords == m_currentCellCoords;
wxRect rect;
- rect.x = m_colRights[col] - m_colWidths[col];
- rect.y = m_rowBottoms[row] - m_rowHeights[row];
- rect.width = m_colWidths[col] - 1;
- rect.height = m_rowHeights[row] - 1;
+ rect.x = GetColLeft(col);
+ rect.y = GetRowTop(row);
+ rect.width = GetColWidth(col) - 1;
+ rect.height = GetRowHeight(row) - 1;
// if the editor is shown, we should use it and not the renderer
if ( isCurrent && IsCellEditControlEnabled() )
// but all the rest is drawn by the cell renderer and hence may be
// customized
attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
-
- if ( isCurrent )
- {
- DrawCellHighlight(dc, attr);
- }
}
attr->DecRef();
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
- if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
wxRect rect;
- rect.x = m_colRights[col] - m_colWidths[col];
- rect.y = m_rowBottoms[row] - m_rowHeights[row];
- rect.width = m_colWidths[col] - 1;
- rect.height = m_rowHeights[row] - 1;
+ rect.x = GetColLeft(col);
+ rect.y = GetRowTop(row);
+ rect.width = GetColWidth(col) - 1;
+ rect.height = GetRowHeight(row) - 1;
+
+ // hmmm... what could we do here to show that the cell is disabled?
+ // for now, I just draw a thinner border than for the other ones, but
+ // it doesn't look really good
+ dc.SetPen(wxPen(m_gridLineColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
- if ( attr->IsReadOnly() )
- {
- // hmmm... what could we do here to show that the cell is disabled?
- // for now, I just draw a thinner border than for the other ones, but
- // it doesn't look really good
- dc.SetPen(wxPen(m_gridLineColour, 2, wxSOLID));
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle(rect);
- dc.DrawRectangle(rect);
- }
- else
- {
- // VZ: my experiments with 3d borders...
#if 0
- dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID));
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ // VZ: my experiments with 3d borders...
- dc.DrawRectangle(rect);
-#else //1
- // FIXME we should properly set colours for arbitrary bg
+ // how to properly set colours for arbitrary bg?
wxCoord x1 = rect.x,
y1 = rect.y,
- x2 = rect.x + rect.width,
- y2 = rect.y + rect.height;
+ x2 = rect.x + rect.width -1,
+ y2 = rect.y + rect.height -1;
dc.SetPen(*wxWHITE_PEN);
- dc.DrawLine(x1, y1, x2 - 1, y1);
- dc.DrawLine(x1, y1, x1, y2 - 1);
+ dc.DrawLine(x1, y1, x2, y1);
+ dc.DrawLine(x1, y1, x1, y2);
- dc.SetPen(*wxLIGHT_GREY_PEN);
dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
- dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 - 1);
+ dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 );
dc.SetPen(*wxBLACK_PEN);
dc.DrawLine(x1, y2, x2, y2);
- dc.DrawLine(x2, y1, x2, y2);
-#endif // 0/1
- }
+ dc.DrawLine(x2, y1, x2, y2+1);
+#endif // 0
}
void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
{
- if ( m_colWidths[coords.GetCol()] <=0 ||
- m_rowHeights[coords.GetRow()] <= 0 ) return;
-
- dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
int row = coords.GetRow();
int col = coords.GetCol();
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ return;
+
+ dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
// right hand border
//
- dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row],
- m_colRights[col], m_rowBottoms[row] );
+ dc.DrawLine( GetColRight(col), GetRowTop(row),
+ GetColRight(col), GetRowBottom(row) );
// bottom border
//
- dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row],
- m_colRights[col], m_rowBottoms[row] );
+ dc.DrawLine( GetColLeft(col), GetRowBottom(row),
+ GetColRight(col), GetRowBottom(row) );
}
+void wxGrid::DrawHighlight(wxDC& dc)
+{
+ // if the active cell was repainted, repaint its highlight too because it
+ // might have been damaged by the grid lines
+ size_t count = m_cellsExposed.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ if ( m_cellsExposed[n] == m_currentCellCoords )
+ {
+ wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+ DrawCellHighlight(dc, attr);
+ attr->DecRef();
+
+ break;
+ }
+ }
+}
// TODO: remove this ???
// This is used to redraw all grid lines e.g. when the grid line colour
// avoid drawing grid lines past the last row and col
//
- right = wxMin( right, m_colRights[m_numCols-1] );
- bottom = wxMin( bottom, m_rowBottoms[m_numRows-1] );
+ right = wxMin( right, GetColRight(m_numCols - 1) );
+ bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
int i;
for ( i = 0; i < m_numRows; i++ )
{
- if ( m_rowBottoms[i]-1 > bottom )
+ int bot = GetRowBottom(i) - 1;
+
+ if ( bot > bottom )
{
break;
}
- else if ( m_rowBottoms[i]-1 >= top )
+
+ if ( bot >= top )
{
- dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 );
+ dc.DrawLine( left, bot, right, bot );
}
}
//
for ( i = 0; i < m_numCols; i++ )
{
- if ( m_colRights[i]-1 > right )
+ int colRight = GetColRight(i) - 1;
+ if ( colRight > right )
{
break;
}
- else if ( m_colRights[i]-1 >= left )
+
+ if ( colRight >= left )
{
- dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom );
+ dc.DrawLine( colRight, top, colRight, bottom );
}
}
}
void wxGrid::DrawRowLabel( wxDC& dc, int row )
{
- if ( m_rowHeights[row] <= 0 ) return;
+ if ( GetRowHeight(row) <= 0 )
+ return;
- int rowTop = m_rowBottoms[row] - m_rowHeights[row];
+ int rowTop = GetRowTop(row),
+ rowBottom = GetRowBottom(row) - 1;
dc.SetPen( *wxBLACK_PEN );
dc.DrawLine( m_rowLabelWidth-1, rowTop,
- m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+ m_rowLabelWidth-1, rowBottom );
- dc.DrawLine( 0, m_rowBottoms[row]-1,
- m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+ dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom );
dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 );
+ dc.DrawLine( 0, rowTop, 0, rowBottom );
dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
dc.SetBackgroundMode( wxTRANSPARENT );
wxRect rect;
rect.SetX( 2 );
- rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 );
+ rect.SetY( GetRowTop(row) + 2 );
rect.SetWidth( m_rowLabelWidth - 4 );
- rect.SetHeight( m_rowHeights[row] - 4 );
+ rect.SetHeight( GetRowHeight(row) - 4 );
DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign );
}
void wxGrid::DrawColLabel( wxDC& dc, int col )
{
- if ( m_colWidths[col] <= 0 ) return;
+ if ( GetColWidth(col) <= 0 )
+ return;
- int colLeft = m_colRights[col] - m_colWidths[col];
+ int colLeft = GetColLeft(col),
+ colRight = GetColRight(col) - 1;
dc.SetPen( *wxBLACK_PEN );
- dc.DrawLine( m_colRights[col]-1, 0,
- m_colRights[col]-1, m_colLabelHeight-1 );
+ dc.DrawLine( colRight, 0,
+ colRight, m_colLabelHeight-1 );
dc.DrawLine( colLeft, m_colLabelHeight-1,
- m_colRights[col]-1, m_colLabelHeight-1 );
+ colRight, m_colLabelHeight-1 );
dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
- dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 );
+ dc.DrawLine( colLeft, 0, colRight, 0 );
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
GetColLabelAlignment( &hAlign, &vAlign );
wxRect rect;
- rect.SetX( m_colRights[col] - m_colWidths[col] + 2 );
+ rect.SetX( colLeft + 2 );
rect.SetY( 2 );
- rect.SetWidth( m_colWidths[col] - 4 );
+ rect.SetWidth( GetColWidth(col) - 4 );
rect.SetHeight( m_colLabelHeight - 4 );
DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign );
}
for ( i = 0; i < m_numRows; i++ )
{
- if ( y < m_rowBottoms[i] ) return i;
+ if ( y < GetRowBottom(i) )
+ return i;
}
return m_numRows; //-1;
for ( i = 0; i < m_numCols; i++ )
{
- if ( x < m_colRights[i] ) return i;
+ if ( x < GetColRight(i) )
+ return i;
}
return m_numCols; //-1;
for ( i = 0; i < m_numRows; i++ )
{
- if ( m_rowHeights[i] > WXGRID_LABEL_EDGE_ZONE )
+ if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE )
{
- d = abs( y - m_rowBottoms[i] );
- {
- if ( d < WXGRID_LABEL_EDGE_ZONE ) return i;
- }
+ d = abs( y - GetRowBottom(i) );
+ if ( d < WXGRID_LABEL_EDGE_ZONE )
+ return i;
}
}
for ( i = 0; i < m_numCols; i++ )
{
- if ( m_colWidths[i] > WXGRID_LABEL_EDGE_ZONE )
+ if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE )
{
- d = abs( x - m_colRights[i] );
- {
- if ( d < WXGRID_LABEL_EDGE_ZONE ) return i;
- }
+ d = abs( x - GetColRight(i) );
+ if ( d < WXGRID_LABEL_EDGE_ZONE )
+ return i;
}
}
if ( row >= 0 && row < m_numRows &&
col >= 0 && col < m_numCols )
{
- rect.x = m_colRights[col] - m_colWidths[col];
- rect.y = m_rowBottoms[row] - m_rowHeights[row];
- rect.width = m_colWidths[col];
- rect.height = m_rowHeights[ row ];
+ rect.x = GetColLeft(col);
+ rect.y = GetRowTop(row);
+ rect.width = GetColWidth(col);
+ rect.height = GetRowHeight(row);
}
return rect;
ypos = r.GetTop();
for ( i = row-1; i >= 0; i-- )
{
- if ( h + m_rowHeights[i] > ch ) break;
+ int rowHeight = GetRowHeight(i);
+ if ( h + rowHeight > ch )
+ break;
- h += m_rowHeights[i];
- ypos -= m_rowHeights[i];
+ h += rowHeight;
+ ypos -= rowHeight;
}
// we divide it later by GRID_SCROLL_LINE, make sure that we don't
xpos = r.GetLeft();
for ( i = col-1; i >= 0; i-- )
{
- if ( w + m_colWidths[i] > cw ) break;
+ int colWidth = GetColWidth(i);
+ if ( w + colWidth > cw )
+ break;
- w += m_colWidths[i];
- xpos -= m_colWidths[i];
+ w += colWidth;
+ xpos -= colWidth;
}
// see comment for ypos above
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
- int y = m_rowBottoms[ row ] - m_rowHeights[ row ];
+ int y = GetRowTop(row);
int newRow = YToRow( y - ch + 1 );
if ( newRow == -1 )
{
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
- int y = m_rowBottoms[ row ] - m_rowHeights[ row ];
+ int y = GetRowTop(row);
int newRow = YToRow( y + ch );
if ( newRow == -1 )
{
{
wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
- return m_rowHeights[row];
+ return GetRowHeight(row);
}
int wxGrid::GetDefaultColSize()
{
wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
- return m_colWidths[col];
+ return GetColWidth(col);
}
// ============================================================================
if ( resizeExistingRows )
{
- int row;
- int bottom = 0;
- for ( row = 0; row < m_numRows; row++ )
- {
- m_rowHeights[row] = m_defaultRowHeight;
- bottom += m_defaultRowHeight;
- m_rowBottoms[row] = bottom;
- }
+ InitRowHeights();
+
CalcDimensions();
}
}
{
wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
- int i;
+ if ( m_rowHeights.IsEmpty() )
+ {
+ // need to really create the array
+ InitRowHeights();
+ }
int h = wxMax( 0, height );
int diff = h - m_rowHeights[row];
m_rowHeights[row] = h;
+ int i;
for ( i = row; i < m_numRows; i++ )
{
m_rowBottoms[i] += diff;
if ( resizeExistingCols )
{
- int col;
- int right = 0;
- for ( col = 0; col < m_numCols; col++ )
- {
- m_colWidths[col] = m_defaultColWidth;
- right += m_defaultColWidth;
- m_colRights[col] = right;
- }
+ InitColWidths();
+
CalcDimensions();
}
}
{
wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
- int i;
+ // should we check that it's bigger than GetColMinimalWidth(col) here?
+
+ if ( m_colWidths.IsEmpty() )
+ {
+ // need to really create the array
+ InitColWidths();
+ }
int w = wxMax( 0, width );
int diff = w - m_colWidths[col];
m_colWidths[col] = w;
+ int i;
for ( i = col; i < m_numCols; i++ )
{
m_colRights[i] += diff;
}
+void wxGrid::SetColMinimalWidth( int col, int width )
+{
+ m_colMinWidths.Put(col, (wxObject *)width);
+}
+
+int wxGrid::GetColMinimalWidth(int col) const
+{
+ wxObject *obj = m_colMinWidths.Get(m_dragRowOrCol);
+ return obj ? (int)obj : WXGRID_MIN_COL_WIDTH;
+}
+
//
// ------ cell value accessor functions
//
if ( IsSelection() && addToSelected )
{
wxRect rect[4];
- bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
+
int i;
wxCoord oldLeft = m_selectedTopLeft.GetCol();
if ( IsSelection() && addToSelected )
{
wxRect rect[4];
- bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
int i;
wxCoord oldLeft = m_selectedTopLeft.GetCol();
// Either one rectangle is a real subset of the
// other, or they are (almost) disjoint!
wxRect rect[4];
- bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
int i;
// Store intermediate values
projects / wxWidgets.git / blobdiff