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;
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
//
rect.height = ch - rect.y;
m_rowLabelWin->Refresh( TRUE, &rect );
rect.width = cw;
- m_gridWin->Refresh( TRUE, &rect );
+ m_gridWin->Refresh( FALSE, &rect );
}
ShowCellEditControl();
rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( TRUE, &rect );
rect.height = ch;
- m_gridWin->Refresh( TRUE, &rect );
+ m_gridWin->Refresh( FALSE, &rect );
}
ShowCellEditControl();
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_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 )
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(),
// 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