#include "wx/generic/grid.h"
-#ifndef DRAW_LINES
-#define DRAW_LINES 1
+#ifndef WXGRID_DRAW_LINES
+#define WXGRID_DRAW_LINES 1
#endif
//////////////////////////////////////////////////////////////////////
//
// m_owner->PrepareDC( dc );
- wxCoord x, y;
+ int x, y;
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( 0, -y );
//
// m_owner->PrepareDC( dc );
- wxCoord x, y;
+ int x, y;
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( -x, 0 );
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size )
- : wxPanel( parent, id, pos, size, wxSUNKEN_BORDER, "grid window" )
+ : wxPanel( parent, id, pos, size, 0, "grid window" )
{
m_owner = parent;
m_rowLabelWin = rowLblWin;
wxRegion reg = GetUpdateRegion();
m_owner->CalcCellsExposed( reg );
m_owner->DrawGridCellArea( dc );
-#if DRAW_LINES
+#if WXGRID_DRAW_LINES
m_owner->DrawAllGridLines( dc, reg );
#endif
}
void wxGrid::Create()
{
+ m_created = FALSE; // set to TRUE by CreateGrid
+ m_displayed = FALSE; // set to TRUE by OnPaint
+
+ m_table = (wxGridTableBase *) NULL;
+ m_cellEditCtrl = (wxWindow *) NULL;
+
+ m_numRows = 0;
+ m_numCols = 0;
+ m_currentCellCoords = wxGridNoCellCoords;
+
int colLblH = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
int rowLblW = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
if ( m_numRows > 0 && m_numCols > 0 )
{
- int right = m_colRights[ m_numCols-1 ] + 20;
- int bottom = m_rowBottoms[ m_numRows-1 ] + 20;
+ int right = m_colRights[ m_numCols-1 ] + 50;
+ int bottom = m_rowBottoms[ m_numRows-1 ] + 50;
// TODO: restore the scroll position that we had before sizing
//
// Only needed to get the correct rect.y:
wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
rect.x = 0;
+ CalcScrolledPosition(0, rect.y, &dummy, &rect.y);
rect.width = m_rowLabelWidth;
rect.height = ch - rect.y;
m_rowLabelWin->Refresh( TRUE, &rect );
rect.width = cw;
- m_gridWin->Refresh( TRUE, &rect );
+ m_gridWin->Refresh( FALSE, &rect );
}
ShowCellEditControl();
}
}
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_dragLastPos = -1;
}
}
else
{
- if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
- {
- m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ if ( m_rowLabelWin->GetCursor() == m_rowResizeCursor )
m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR );
- }
}
}
}
// Only needed to get the correct rect.x:
wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
rect.y = 0;
+ CalcScrolledPosition(rect.x, 0, &rect.x, &dummy);
rect.width = cw - rect.x;
rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( TRUE, &rect );
rect.height = ch;
- m_gridWin->Refresh( TRUE, &rect );
+ m_gridWin->Refresh( FALSE, &rect );
}
ShowCellEditControl();
}
}
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_dragLastPos = -1;
}
}
else
{
- if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
- {
- m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ if ( m_colLabelWin->GetCursor() == m_colResizeCursor )
m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR );
- }
}
}
}
// no default action at the moment
}
}
+
+ // ------------ Moving and no button action
+ //
+ else if ( event.Moving() && !event.IsButton() )
+ {
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+ }
}
}
SetEditControlValue();
ShowCellEditControl();
}
+
+ m_displayed = TRUE;
}
return;
}
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
-
- if ( m_currentCellCoords != wxGridNoCellCoords )
+ if ( m_displayed &&
+ m_currentCellCoords != wxGridNoCellCoords )
{
HideCellEditControl();
SaveEditControlValue();
m_currentCellCoords = coords;
SetEditControlValue();
- ShowCellEditControl();
- if ( IsSelection() )
+ if ( m_displayed )
{
- wxRect r( SelectionToDeviceRect() );
- ClearSelection();
- if ( !GetBatchCount() ) m_gridWin->Refresh( TRUE, &r );
+ ShowCellEditControl();
+
+ if ( IsSelection() )
+ {
+ wxRect r( SelectionToDeviceRect() );
+ ClearSelection();
+ if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+ }
}
}
if ( m_colWidths[coords.GetCol()] <=0 ||
m_rowHeights[coords.GetRow()] <= 0 ) return;
-#if !DRAW_LINES
+#if !WXGRID_DRAW_LINES
if ( m_gridLinesEnabled )
DrawCellBorder( dc, coords );
#endif
CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
}
+ // 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] );
+
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
// horizontal grid lines
//
int i;
- for ( i = 0; i <= m_numRows; i++ )
+ for ( i = 0; i < m_numRows; i++ )
{
if ( m_rowBottoms[i] > bottom )
{
// vertical grid lines
//
- for ( i = 0; i <= m_numCols; i++ )
+ for ( i = 0; i < m_numCols; i++ )
{
if ( m_colRights[i] > right )
{
{
if ( m_rowHeights[row] <= 0 ) return;
- // draw the label's horizontal border (the vertical border is
- // provided by the cell area window margin)
- //
+ int rowTop = m_rowBottoms[row] - m_rowHeights[row];
+
dc.SetPen( *wxBLACK_PEN );
-
- dc.DrawLine( 0, m_rowBottoms[row]+1,
- m_rowLabelWidth, m_rowBottoms[row]+1 );
-
+ dc.DrawLine( m_rowLabelWidth-1, rowTop,
+ m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+
+ dc.DrawLine( 0, m_rowBottoms[row]-1,
+ m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+
dc.SetPen( *wxWHITE_PEN );
-
- dc.DrawLine( 0, m_rowBottoms[row]+2,
- m_rowLabelWidth, m_rowBottoms[row]+2 );
+ dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 );
+ dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
{
if ( m_colWidths[col] <= 0 ) return;
- // draw the label's vertical border (the horizontal border is
- // provided by the cell area window margin)
- //
+ int colLeft = m_colRights[col] - m_colWidths[col];
+
dc.SetPen( *wxBLACK_PEN );
-
- dc.DrawLine( m_colRights[col]+1, 0,
- m_colRights[col]+1, m_colLabelHeight );
-
+ dc.DrawLine( m_colRights[col]-1, 0,
+ m_colRights[col]-1, m_colLabelHeight-1 );
+
+ dc.DrawLine( colLeft, m_colLabelHeight-1,
+ m_colRights[col]-1, 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( m_colRights[col]+2, 0,
- m_colRights[col]+2, m_colLabelHeight );
+ dc.SetBackgroundMode( wxTRANSPARENT );
+ dc.SetTextForeground( GetLabelTextColour() );
+ dc.SetFont( GetLabelFont() );
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
}
}
+
void wxGrid::SetRowLabelSize( int width )
{
- // TODO: how to do this with the box sizers ?
+ wxSize sz;
+
+ width = wxMax( width, 0 );
+ if ( width != m_rowLabelWidth )
+ {
+ // Hiding the row labels (and possible the corner label)
+ //
+ if ( width == 0 )
+ {
+ m_rowLabelWin->Show( FALSE );
+
+ // If the col labels are on display we need to hide the
+ // corner label and remove it from the top sizer
+ //
+ if ( m_colLabelHeight > 0 )
+ {
+ m_cornerLabelWin->Show( FALSE );
+ m_topSizer->Remove( m_cornerLabelWin );
+ }
+
+ m_middleSizer->Remove( m_rowLabelWin );
+ }
+ else
+ {
+ // Displaying the row labels (and possibly the corner
+ // label) after being hidden
+ //
+ if ( m_rowLabelWidth == 0 )
+ {
+ m_rowLabelWin->Show( TRUE );
+
+ if ( m_colLabelHeight > 0 )
+ {
+ m_cornerLabelWin->Show( TRUE );
+ m_topSizer->Prepend( m_cornerLabelWin, 0 );
+ }
+
+ m_middleSizer->Prepend( m_rowLabelWin, 0, wxEXPAND );
+ }
+
+
+ // set the width of the corner label if it is on display
+ //
+ if ( m_colLabelHeight > 0 )
+ {
+ wxList& childList = m_topSizer->GetChildren();
+ wxNode *node = childList.First();
+ while (node)
+ {
+ wxSizerItem *item = (wxSizerItem*)node->Data();
+ if ( item->GetWindow() == m_cornerLabelWin )
+ {
+ item->SetInitSize( width, m_colLabelHeight );
+ break;
+ }
+ node = node->Next();
+ }
+ }
+
+ // set the width of the row labels
+ //
+ wxList& childList = m_middleSizer->GetChildren();
+ wxNode *node = childList.First();
+ while (node)
+ {
+ wxSizerItem *item = (wxSizerItem*)node->Data();
+ if ( item->GetWindow() == m_rowLabelWin )
+ {
+ sz = item->GetWindow()->GetSize();
+ item->SetInitSize( width, sz.GetHeight() );
+ break;
+ }
+ node = node->Next();
+ }
+ }
+
+ m_rowLabelWidth = width;
+ m_mainSizer->Layout();
+ }
}
+
void wxGrid::SetColLabelSize( int height )
{
- // TODO: how to do this with the box sizers ?
+ wxSize sz;
+
+ if ( height < 0 ) height = 0;
+ if ( height != m_colLabelHeight )
+ {
+ // hiding the column labels
+ //
+ if ( height == 0 )
+ {
+ m_cornerLabelWin->Show( FALSE );
+ m_colLabelWin->Show( FALSE );
+
+ // Note: this call will actually delete the sizer
+ //
+ m_mainSizer->Remove( m_topSizer );
+ m_topSizer = (wxBoxSizer *)NULL;
+ }
+ else
+ {
+ // column labels to be displayed after being hidden
+ //
+ if ( m_colLabelHeight == 0 )
+ {
+ // recreate the top sizer
+ //
+ m_topSizer = new wxBoxSizer( wxHORIZONTAL );
+
+ if ( m_rowLabelWidth > 0 )
+ m_topSizer->Add( m_cornerLabelWin, 0 );
+
+ m_topSizer->Add( m_colLabelWin, 1 );
+ m_mainSizer->Prepend( m_topSizer, 0, wxEXPAND );
+
+ // only show the corner label if the row labels are
+ // also displayed
+ //
+ if ( m_rowLabelWidth > 0 )
+ m_cornerLabelWin->Show( TRUE );
+
+ m_colLabelWin->Show( TRUE );
+ }
+
+ wxList& childList = m_topSizer->GetChildren();
+ wxNode *node = childList.First();
+ while (node)
+ {
+ wxSizerItem *item = (wxSizerItem*)node->Data();
+
+ if ( (item->GetWindow() == m_cornerLabelWin && m_rowLabelWidth > 0) ||
+ item->GetWindow() == m_colLabelWin )
+ {
+ sz = item->GetWindow()->GetSize();
+ item->SetInitSize( sz.GetWidth(), height );
+ }
+ node = node->Next();
+ }
+ }
+
+ m_colLabelHeight = height;
+ m_mainSizer->Layout();
+ }
}
+
void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
{
if ( m_labelBackgroundColour != colour )
wxRect rect = CellToRect( row, 0);
if ( rect.height > 0 )
{
+ CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
rect.x = m_left;
rect.width = m_rowLabelWidth;
m_rowLabelWin->Refresh( TRUE, &rect );
wxRect rect = CellToRect( 0, col );
if ( rect.width > 0 )
{
+ CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
rect.y = m_top;
rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( TRUE, &rect );
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- DrawAllGridLines( dc );
+ DrawAllGridLines( dc, wxRegion() );
}
}
{
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- DrawAllGridLines( dc );
+ DrawAllGridLines( dc, wxRegion() );
}
else
{
for (i = 0; i < 4; i++ )
if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( TRUE, &(rect[i]) );
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
}
else
{
r = SelectionToDeviceRect();
ClearSelection();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
+ if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
m_selectedTopLeft.Set( row, 0 );
m_selectedBottomRight.Set( row, m_numCols-1 );
r = SelectionToDeviceRect();
- m_gridWin->Refresh( TRUE, &r );
+ m_gridWin->Refresh( FALSE, &r );
}
wxGridRangeSelectEvent gridEvt( GetId(),
for (i = 0; i < 4; i++ )
if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( TRUE, &(rect[i]) );
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
}
else
{
r = SelectionToDeviceRect();
ClearSelection();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
+ if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
m_selectedTopLeft.Set( 0, col );
m_selectedBottomRight.Set( m_numRows-1, col );
r = SelectionToDeviceRect();
- m_gridWin->Refresh( TRUE, &r );
+ m_gridWin->Refresh( FALSE, &r );
}
wxGridRangeSelectEvent gridEvt( GetId(),
temp = oldLeft;
oldLeft = leftCol;
leftCol = temp;
- }
+ }
if (oldTop > topRow )
{
temp = oldTop;
oldTop = topRow;
topRow = temp;
- }
- if (oldRight < rightCol )
+ }
+ if (oldRight < rightCol )
{
temp = oldRight;
oldRight = rightCol;
rightCol = temp;
- }
- if (oldBottom < bottomRow)
- {
+ }
+ if (oldBottom < bottomRow)
+ {
temp = oldBottom;
oldBottom = bottomRow;
bottomRow = temp;
- }
+ }
// Now, either the stuff marked old is the outer
// rectangle or we don't have a situation where one
// is contained in the other.
- if ( oldLeft < leftCol )
- {
- need_refresh[0] = TRUE;
- rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- oldLeft ),
- wxGridCellCoords ( oldBottom,
- leftCol - 1 ) );
- }
-
- if ( oldTop < topRow )
- {
- need_refresh[1] = TRUE;
- rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- leftCol ),
- wxGridCellCoords ( topRow - 1,
- rightCol ) );
- }
-
- if ( oldRight > rightCol )
- {
- need_refresh[2] = TRUE;
- rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- rightCol + 1 ),
- wxGridCellCoords ( oldBottom,
- oldRight ) );
- }
-
- if ( oldBottom > bottomRow )
- {
- need_refresh[3] = TRUE;
- rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
- leftCol ),
- wxGridCellCoords ( oldBottom,
- rightCol ) );
- }
+ if ( oldLeft < leftCol )
+ {
+ need_refresh[0] = TRUE;
+ rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ oldLeft ),
+ wxGridCellCoords ( oldBottom,
+ leftCol - 1 ) );
+ }
+
+ if ( oldTop < topRow )
+ {
+ need_refresh[1] = TRUE;
+ rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ leftCol ),
+ wxGridCellCoords ( topRow - 1,
+ rightCol ) );
+ }
+
+ if ( oldRight > rightCol )
+ {
+ need_refresh[2] = TRUE;
+ rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ rightCol + 1 ),
+ wxGridCellCoords ( oldBottom,
+ oldRight ) );
+ }
+
+ if ( oldBottom > bottomRow )
+ {
+ need_refresh[3] = TRUE;
+ rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
+ leftCol ),
+ wxGridCellCoords ( oldBottom,
+ rightCol ) );
+ }
// Change Selection
// various Refresh() calls
for (i = 0; i < 4; i++ )
if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( TRUE, &(rect[i]) );
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
}
// only generate an event if the block is not being selected by
projects / wxWidgets.git / blobdiff