X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f177c8e7309c8cf3ece1563870d135cc8f0e6a1..b0d6ff2f7fb82e1ba838579ae0ddda70f5de0f8a:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index f473853134..a999ea3e08 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -31,17 +31,28 @@ #include "wx/dcclient.h" #include "wx/settings.h" #include "wx/log.h" + #include "wx/sizer.h" #endif #include "wx/generic/grid.h" +#ifndef WXGRID_DRAW_LINES +#define WXGRID_DRAW_LINES 1 +#endif ////////////////////////////////////////////////////////////////////// wxGridCellCoords wxGridNoCellCoords( -1, -1 ); wxRect wxGridNoCellRect( -1, -1, -1, -1 ); +// this is a magic incantation which must be done! +#include "wx/arrimpl.cpp" + +WX_DEFINE_OBJARRAY(wxGridCellCoordsArray) +// scroll line size +// TODO: fixed so far - make configurable later (and also different for x/y) +static const size_t GRID_SCROLL_LINE = 10; ////////////////////////////////////////////////////////////////////// // @@ -134,7 +145,7 @@ wxString wxGridTableBase::GetColLabelValue( int col ) unsigned int i, n; for ( n = 1; ; n++ ) { - s += ('A' + (char)( col%26 )); + s += (_T('A') + (wxChar)( col%26 )); col = col/26 - 1; if ( col < 0 ) break; } @@ -182,10 +193,6 @@ wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id, // created by wxGrid if you don't specify an alternative table class. // - -// this is a magic incantation which must be done! -#include "wx/arrimpl.cpp" - WX_DEFINE_OBJARRAY(wxGridStringArray) IMPLEMENT_DYNAMIC_CLASS( wxGridStringTable, wxGridTableBase ) @@ -576,6 +583,7 @@ END_EVENT_TABLE() wxGridTextCtrl::wxGridTextCtrl( wxWindow *par, + wxGrid *grid, bool isCellControl, wxWindowID id, const wxString& value, @@ -584,16 +592,17 @@ wxGridTextCtrl::wxGridTextCtrl( wxWindow *par, long style ) : wxTextCtrl( par, id, value, pos, size, style ) { + m_grid = grid; m_isCellControl = isCellControl; } -void wxGridTextCtrl::OnKeyDown( wxKeyEvent& ev ) +void wxGridTextCtrl::OnKeyDown( wxKeyEvent& event ) { - switch ( ev.KeyCode() ) + switch ( event.KeyCode() ) { case WXK_ESCAPE: - ((wxGrid *)GetParent())->SetEditControlValue( startValue ); + m_grid->SetEditControlValue( startValue ); SetInsertionPointEnd(); break; @@ -603,20 +612,42 @@ void wxGridTextCtrl::OnKeyDown( wxKeyEvent& ev ) case WXK_RIGHT: case WXK_PRIOR: case WXK_NEXT: - case WXK_RETURN: + case WXK_SPACE: if ( m_isCellControl ) { // send the event to the parent grid, skipping the // event if nothing happens // - ev.Skip( !GetParent()->ProcessEvent( ev ) ); + event.Skip( m_grid->ProcessEvent( event ) ); } else { // default text control response within the top edit // control // - ev.Skip(); + event.Skip(); + } + break; + + case WXK_RETURN: + if ( m_isCellControl ) + { + if ( !m_grid->ProcessEvent( event ) ) + { +#if defined(__WXMOTIF__) || defined(__WXGTK__) + // wxMotif needs a little extra help... + // + int pos = GetInsertionPoint(); + wxString s( GetValue() ); + s = s.Left(pos) + "\n" + s.Mid(pos); + SetValue(s); + SetInsertionPoint( pos ); +#else + // the other ports can handle a Return key press + // + event.Skip(); +#endif + } } break; @@ -627,45 +658,275 @@ void wxGridTextCtrl::OnKeyDown( wxKeyEvent& ev ) // send the event to the parent grid, skipping the // event if nothing happens // - ev.Skip( !GetParent()->ProcessEvent( ev ) ); + event.Skip( m_grid->ProcessEvent( event ) ); } else { // default text control response within the top edit // control // - ev.Skip(); + event.Skip(); } break; default: - ev.Skip(); + event.Skip(); } } void wxGridTextCtrl::SetStartValue( const wxString& s ) { startValue = s; - wxTextCtrl::SetValue( s.c_str() ); + wxTextCtrl::SetValue(s); +} + + + +////////////////////////////////////////////////////////////////////// + +IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow ) + +BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow ) + EVT_PAINT( wxGridRowLabelWindow::OnPaint ) + EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent ) + EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown ) +END_EVENT_TABLE() + +wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent, + wxWindowID id, + const wxPoint &pos, const wxSize &size ) + : wxWindow( parent, id, pos, size ) +{ + m_owner = parent; +} + +void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event ) +{ + wxPaintDC dc(this); + + // NO - don't do this because it will set both the x and y origin + // coords to match the parent scrolled window and we just want to + // set the y coord - MB + // + // m_owner->PrepareDC( dc ); + + int x, y; + m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); + dc.SetDeviceOrigin( 0, -y ); + + m_owner->CalcRowLabelsExposed( GetUpdateRegion() ); + m_owner->DrawRowLabels( dc ); +} + + +void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) +{ + m_owner->ProcessRowLabelMouseEvent( event ); +} + + +// This seems to be required for wxMotif otherwise the mouse +// cursor must be in the cell edit control to get key events +// +void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} + + + +////////////////////////////////////////////////////////////////////// + +IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow ) + +BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow ) + EVT_PAINT( wxGridColLabelWindow::OnPaint ) + EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent ) + EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown ) +END_EVENT_TABLE() + +wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent, + wxWindowID id, + const wxPoint &pos, const wxSize &size ) + : wxWindow( parent, id, pos, size ) +{ + m_owner = parent; +} + +void wxGridColLabelWindow::OnPaint( wxPaintEvent &event ) +{ + wxPaintDC dc(this); + + // NO - don't do this because it will set both the x and y origin + // coords to match the parent scrolled window and we just want to + // set the x coord - MB + // + // m_owner->PrepareDC( dc ); + + int x, y; + m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); + dc.SetDeviceOrigin( -x, 0 ); + + m_owner->CalcColLabelsExposed( GetUpdateRegion() ); + m_owner->DrawColLabels( dc ); } +void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) +{ + m_owner->ProcessColLabelMouseEvent( event ); +} + + +// This seems to be required for wxMotif otherwise the mouse +// cursor must be in the cell edit control to get key events +// +void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} + + + +////////////////////////////////////////////////////////////////////// + +IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow ) + +BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow ) + EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent ) + EVT_PAINT( wxGridCornerLabelWindow::OnPaint) + EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown ) +END_EVENT_TABLE() + +wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent, + wxWindowID id, + const wxPoint &pos, const wxSize &size ) + : wxWindow( parent, id, pos, size ) +{ + m_owner = parent; +} + +void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) +{ + wxPaintDC dc(this); + + int client_height = 0; + int client_width = 0; + GetClientSize( &client_width, &client_height ); + + dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 ); + dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 ); + + dc.SetPen( *wxWHITE_PEN ); + dc.DrawLine( 0, 0, client_width, 0 ); + dc.DrawLine( 0, 0, 0, client_height ); +} + + +void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) +{ + m_owner->ProcessCornerLabelMouseEvent( event ); +} + + +// This seems to be required for wxMotif otherwise the mouse +// cursor must be in the cell edit control to get key events +// +void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} + + + ////////////////////////////////////////////////////////////////////// -IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxPanel ) +IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel ) + +BEGIN_EVENT_TABLE( wxGridWindow, wxPanel ) + EVT_PAINT( wxGridWindow::OnPaint ) + EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent ) + EVT_KEY_DOWN( wxGridWindow::OnKeyDown ) +END_EVENT_TABLE() + +wxGridWindow::wxGridWindow( wxGrid *parent, + wxGridRowLabelWindow *rowLblWin, + wxGridColLabelWindow *colLblWin, + wxWindowID id, const wxPoint &pos, const wxSize &size ) + : wxPanel( parent, id, pos, size, 0, "grid window" ) +{ + m_owner = parent; + m_rowLabelWin = rowLblWin; + m_colLabelWin = colLblWin; + + SetBackgroundColour( "WHITE" ); +} + + +wxGridWindow::~wxGridWindow() +{ +} + + +void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) +{ + wxPaintDC dc( this ); + m_owner->PrepareDC( dc ); + wxRegion reg = GetUpdateRegion(); + m_owner->CalcCellsExposed( reg ); + m_owner->DrawGridCellArea( dc ); +#if WXGRID_DRAW_LINES + m_owner->DrawAllGridLines( dc, reg ); +#endif +} + + +void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) +{ + wxPanel::ScrollWindow( dx, dy, rect ); + m_rowLabelWin->ScrollWindow( 0, dy, rect ); + m_colLabelWin->ScrollWindow( dx, 0, rect ); +} + + +void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) +{ + m_owner->ProcessGridCellMouseEvent( event ); +} + + +// This seems to be required for wxMotif otherwise the mouse +// cursor must be in the cell edit control to get key events +// +void wxGridWindow::OnKeyDown( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} + -BEGIN_EVENT_TABLE( wxGrid, wxPanel ) +////////////////////////////////////////////////////////////////////// + +IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow ) + +BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow ) EVT_PAINT( wxGrid::OnPaint ) EVT_SIZE( wxGrid::OnSize ) - EVT_MOUSE_EVENTS( wxGrid::OnMouse ) EVT_KEY_DOWN( wxGrid::OnKeyDown ) - EVT_TEXT( wxGRID_CELLCTRL, wxGrid::OnText ) - EVT_TEXT( wxGRID_TOPCTRL, wxGrid::OnText ) - EVT_COMMAND_SCROLL( wxGRID_HORIZSCROLL, wxGrid::OnGridScroll) - EVT_COMMAND_SCROLL( wxGRID_VERTSCROLL, wxGrid::OnGridScroll) END_EVENT_TABLE() +wxGrid::wxGrid( wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) + : wxScrolledWindow( parent, id, pos, size, style, name ) +{ + Create(); +} + wxGrid::~wxGrid() { @@ -679,36 +940,77 @@ wxGrid::~wxGrid() void wxGrid::Create() { - m_table = (wxGridTableBase *) NULL; - m_topEditCtrl = (wxWindow *) NULL; - m_cellEditCtrl = (wxWindow *) NULL; - m_horizScrollBar = (wxScrollBar *) NULL; - m_vertScrollBar = (wxScrollBar *) NULL; + int colLblH = WXGRID_DEFAULT_COL_LABEL_HEIGHT; + int rowLblW = WXGRID_DEFAULT_ROW_LABEL_WIDTH; + + m_rowLabelWin = new wxGridRowLabelWindow( this, + -1, + wxDefaultPosition, + wxSize(rowLblW,-1) ); + + m_colLabelWin = new wxGridColLabelWindow( this, + -1, + wxDefaultPosition, + wxSize(-1, colLblH ) ); + + m_cornerLabelWin = new wxGridCornerLabelWindow( this, + -1, + wxDefaultPosition, + wxSize(rowLblW, colLblH ) ); + + m_gridWin = new wxGridWindow( this, + m_rowLabelWin, + m_colLabelWin, + -1, + wxDefaultPosition, + wxDefaultSize ); + + SetTargetWindow( m_gridWin ); + + m_mainSizer = new wxBoxSizer( wxVERTICAL ); + + m_topSizer = new wxBoxSizer( wxHORIZONTAL ); + m_topSizer->Add( m_cornerLabelWin, 0 ); + m_topSizer->Add( m_colLabelWin, 1 ); + + m_mainSizer->Add( m_topSizer, 0, wxEXPAND ); + + m_middleSizer = new wxBoxSizer( wxHORIZONTAL ); + m_middleSizer->Add( m_rowLabelWin, 0, wxEXPAND ); + m_middleSizer->Add( m_gridWin, 1, wxEXPAND ); + + m_mainSizer->Add( m_middleSizer, 1, wxEXPAND ); - m_numRows = 0; - m_numCols = 0; - m_created = FALSE; + SetAutoLayout( TRUE ); + SetSizer( m_mainSizer ); } -void wxGrid::Init() + +bool wxGrid::CreateGrid( int numRows, int numCols ) { - int i; + if ( m_created ) + { + wxLogError( wxT("wxGrid::CreateGrid(numRows, numCols) called more than once") ); + return FALSE; + } + else + { + m_numRows = numRows; + m_numCols = numCols; + + m_table = new wxGridStringTable( m_numRows, m_numCols ); + m_table->SetView( this ); + Init(); + m_created = TRUE; + } + + return m_created; +} - m_left = 0; - m_top = 0; - // TODO: perhaps have a style flag for control panel - // - m_topEditCtrlEnabled = FALSE; - m_topEditCtrl = new wxGridTextCtrl( this, - FALSE, - wxGRID_TOPCTRL, - "", - wxPoint(10, 10), - wxSize(WXGRID_DEFAULT_TOPEDIT_WIDTH, - WXGRID_DEFAULT_TOPEDIT_HEIGHT), - wxTE_MULTILINE ); - m_topEditCtrl->Show( FALSE ); +void wxGrid::Init() +{ + int i; if ( m_numRows <= 0 ) m_numRows = WXGRID_DEFAULT_NUMBER_ROWS; @@ -719,10 +1021,16 @@ void wxGrid::Init() m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH; m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; - // default labels are pale grey with black text - // - m_labelBackgroundColour = wxColour( 192, 192, 192 ); - m_labelTextColour = wxColour( 0, 0, 0 ); + if ( m_rowLabelWin ) + { + m_labelBackgroundColour = m_rowLabelWin->GetBackgroundColour(); + } + else + { + m_labelBackgroundColour = wxColour( _T("WHITE") ); + } + + m_labelTextColour = wxColour( _T("BLACK") ); // TODO: something better than this ? // @@ -735,59 +1043,43 @@ void wxGrid::Init() m_colLabelHorizAlign = wxCENTRE; m_colLabelVertAlign = wxTOP; - m_defaultRowHeight = WXGRID_DEFAULT_ROW_HEIGHT; m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH; + m_defaultRowHeight = m_gridWin->GetCharHeight(); + +#if defined(__WXMOTIF__) || defined(__WXGTK__) // see also text ctrl sizing in ShowCellEditControl() + m_defaultRowHeight += 8; +#else + m_defaultRowHeight += 4; +#endif m_rowHeights.Alloc( m_numRows ); m_rowBottoms.Alloc( m_numRows ); - m_sumRowHeights = 0; + int rowBottom = 0; for ( i = 0; i < m_numRows; i++ ) { m_rowHeights.Add( m_defaultRowHeight ); - m_rowBottoms.Add( 0 ); // set by CalcDimensions() + rowBottom += m_defaultRowHeight; + m_rowBottoms.Add( rowBottom ); } - m_sumRowHeights = m_defaultRowHeight * m_numRows; m_colWidths.Alloc( m_numCols ); - m_colRights.Alloc( m_numRows ); - m_sumColWidths = 0; + m_colRights.Alloc( m_numCols ); + int colRight = 0; for ( i = 0; i < m_numCols; i++ ) { m_colWidths.Add( m_defaultColWidth ); - m_colRights.Add( 0 ); // set by CalcDimensions() + colRight += m_defaultColWidth; + m_colRights.Add( colRight ); } - m_sumColWidths = m_defaultColWidth * m_numCols; // TODO: improve this ? // m_defaultCellFont = this->GetFont(); - m_gridLineColour = wxColour( 0, 0, 255 ); + m_gridLineColour = wxColour( 128, 128, 255 ); m_gridLinesEnabled = TRUE; - m_scrollBarWidth = WXGRID_DEFAULT_SCROLLBAR_WIDTH; - - m_horizScrollBar = new wxScrollBar( this, - wxGRID_HORIZSCROLL, - wxPoint(0, 0), - wxSize(10, 10), - wxHORIZONTAL); - - m_vertScrollBar = new wxScrollBar( this, - wxGRID_VERTSCROLL, - wxPoint(0, 0), - wxSize(10, 10), - wxVERTICAL); - m_scrollPosX = 0; - m_scrollPosY = 0; - m_wholeColsVisible = 0; - m_wholeRowsVisible = 0; - - m_firstPaint = TRUE; - m_inOnKeyDown = FALSE; - m_batchCount = 0; - - m_cursorMode = WXGRID_CURSOR_DEFAULT; + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; m_dragLastPos = -1; m_dragRowOrCol = -1; m_isDragging = FALSE; @@ -796,22 +1088,25 @@ void wxGrid::Init() m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE ); m_currentCellCoords = wxGridNoCellCoords; - m_currentCellHighlighted = FALSE; m_selectedTopLeft = wxGridNoCellCoords; m_selectedBottomRight = wxGridNoCellCoords; m_editable = TRUE; // default for whole grid + m_inOnKeyDown = FALSE; + m_batchCount = 0; + // TODO: extend this to other types of controls // - m_cellEditCtrl = new wxGridTextCtrl( this, + m_cellEditCtrl = new wxGridTextCtrl( m_gridWin, + this, TRUE, wxGRID_CELLCTRL, "", wxPoint(1,1), wxSize(1,1) -#ifdef __WXMSW__ +#if defined(__WXMSW__) , wxTE_MULTILINE | wxTE_NO_VSCROLL #endif ); @@ -819,254 +1114,97 @@ void wxGrid::Init() m_cellEditCtrl->Show( FALSE ); m_cellEditCtrlEnabled = TRUE; m_editCtrlType = wxGRID_TEXTCTRL; - - // This is here in case OnSize does not get called when the grid is - // displayed - // - CalcDimensions(); } void wxGrid::CalcDimensions() { - int i; + int cw, ch; + GetClientSize( &cw, &ch ); - if ( IsTopEditControlEnabled() ) + if ( m_numRows > 0 && m_numCols > 0 ) { - int ctrlW, ctrlH; - m_topEditCtrl->GetSize( &ctrlW, &ctrlH ); + int right = m_colRights[ m_numCols-1 ] + 50; + int bottom = m_rowBottoms[ m_numRows-1 ] + 50; - m_top = ctrlH + 20; - } - else - { - m_top = 0; + // TODO: restore the scroll position that we had before sizing + // + int x, y; + GetViewStart( &x, &y ); + SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE, + right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE, + x, y ); } +} - // check to see if either of the scroll bars are required - // - int cw, ch; - GetClientSize(&cw, &ch); - // begin by assuming that we don't need either scroll bar - // - int vertScrollBarWidth = 0; - int horizScrollBarHeight = 0; +// this is called when the grid table sends a message to say that it +// has been redimensioned +// +bool wxGrid::Redimension( wxGridTableMessage& msg ) +{ + int i; - // Each scroll bar needs to eventually know if the other one is - // required in deciding whether or not it is also required - hence - // this loop. A bit inelegant but simple and it works. - // - int check; - for ( check = 0; check < 2; check++ ) + switch ( msg.GetId() ) { - if ( m_top + m_colLabelHeight + m_sumRowHeights + horizScrollBarHeight > ch ) - { - vertScrollBarWidth = m_scrollBarWidth; - } - - if ( m_left + m_rowLabelWidth + m_sumColWidths + vertScrollBarWidth > cw) + case wxGRIDTABLE_NOTIFY_ROWS_INSERTED: { - horizScrollBarHeight = m_scrollBarWidth; - } - } + size_t pos = msg.GetCommandInt(); + int numRows = msg.GetCommandInt2(); + for ( i = 0; i < numRows; i++ ) + { + m_rowHeights.Insert( m_defaultRowHeight, pos ); + m_rowBottoms.Insert( 0, pos ); + } + m_numRows += numRows; + int bottom = 0; + if ( pos > 0 ) bottom = m_rowBottoms[pos-1]; - // if the window has been resized while scrolled then the scroll - // position might need to be adjusted... - // - bool adjustScrollPos = FALSE; - if ( !vertScrollBarWidth ) - { - if ( m_scrollPosY ) - { - adjustScrollPos = TRUE; - m_scrollPosY = 0; - } - } - if ( !horizScrollBarHeight ) - { - if ( m_scrollPosX ) - { - adjustScrollPos = TRUE; - m_scrollPosX = 0; + for ( i = pos; i < m_numRows; i++ ) + { + bottom += m_rowHeights[i]; + m_rowBottoms[i] = bottom; + } + CalcDimensions(); } - } + return TRUE; + case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: + { + int numRows = msg.GetCommandInt(); + for ( i = 0; i < numRows; i++ ) + { + m_rowHeights.Add( m_defaultRowHeight ); + m_rowBottoms.Add( 0 ); + } - // calculate the coords of row bottom edges and col right edges - // - int bottom = m_top + m_colLabelHeight; - for ( i = m_scrollPosY; i < m_numRows; i++ ) - { - bottom += m_rowHeights[i]; - m_rowBottoms[i] = bottom; - } + int oldNumRows = m_numRows; + m_numRows += numRows; - int right = m_left + m_rowLabelWidth; - for ( i = m_scrollPosX; i < m_numCols; i++ ) - { - right += m_colWidths[i]; - m_colRights[i] = right; - } + int bottom = 0; + if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1]; + for ( i = oldNumRows; i < m_numRows; i++ ) + { + bottom += m_rowHeights[i]; + m_rowBottoms[i] = bottom; + } + CalcDimensions(); + } + return TRUE; - // check how many rows and cols are visible - // - m_wholeRowsVisible = 0; - if ( m_numRows > 0 ) - { - for ( i = m_scrollPosY; i < m_numRows; i++ ) - { - // A partial row doesn't count, we still have to scroll to - // see the rest of it - if ( m_rowBottoms[i] + horizScrollBarHeight > ch ) break; - - m_wholeRowsVisible++ ; - } - } - - m_wholeColsVisible = 0; - if ( m_numCols ) - { - for ( i = m_scrollPosX; i < m_numCols; i++ ) - { - // A partial col doesn't count, we still have to scroll to - // see the rest of it - if ( m_colRights[i] + vertScrollBarWidth > cw ) break; - - m_wholeColsVisible++ ; - } - } - - if ( m_vertScrollBar ) - { - if ( !vertScrollBarWidth ) - { - m_vertScrollBar->Show(FALSE); - } - else - { - m_vertScrollBar->Show(TRUE); - m_vertScrollBar->SetScrollbar( - m_scrollPosY, - wxMax(m_wholeRowsVisible, 1), - (m_wholeRowsVisible == 0 ? 1 : m_numRows), - wxMax(m_wholeRowsVisible, 1) ); - - m_vertScrollBar->SetSize( cw - m_scrollBarWidth, - m_top, - m_scrollBarWidth, - ch - m_top - horizScrollBarHeight); - } - } - - if ( m_horizScrollBar ) - { - if ( !horizScrollBarHeight ) - { - m_horizScrollBar->Show(FALSE); - } - else - { - m_horizScrollBar->Show(TRUE); - - m_horizScrollBar->SetScrollbar( - m_scrollPosX, - wxMax(m_wholeColsVisible, 1), - (m_wholeColsVisible == 0) ? 1 : m_numCols, - wxMax(m_wholeColsVisible, 1) ); - - m_horizScrollBar->SetSize( m_left, - ch - m_scrollBarWidth, - cw - m_left - vertScrollBarWidth, - m_scrollBarWidth ); - } - } - - m_bottom = m_right = 0; - if ( m_numRows > 0 ) - { - m_bottom = wxMin( m_rowBottoms[m_numRows-1], - ch - horizScrollBarHeight ); - } - if ( m_numCols > 0 ) - { - m_right = wxMin( m_colRights[m_numCols-1], - cw - vertScrollBarWidth ); - } - - // if the scroll position was adjusted (due to a window resize) - // ensure that the cell highlight and edit control are displayed - // correctly - // - if ( adjustScrollPos ) SelectCell( m_currentCellCoords ); -} - - -bool wxGrid::IsOnScreen() -{ - int cw, ch; - GetClientSize( &cw, &ch ); - return ( cw > 10 ); -} - - -// this is called when the grid table sends a message to say that it -// has been redimensioned -// -bool wxGrid::Redimension( wxGridTableMessage& msg ) -{ - int i; - - switch ( msg.GetId() ) - { - case wxGRIDTABLE_NOTIFY_ROWS_INSERTED: - { - size_t pos = msg.GetCommandInt(); - int numRows = msg.GetCommandInt2(); - for ( i = 0; i < numRows; i++ ) - { - m_rowHeights.Insert( m_defaultRowHeight, pos ); - m_rowBottoms.Insert( 0, pos ); - m_sumRowHeights += m_defaultRowHeight; - } - m_numRows += numRows; - CalcDimensions(); - } - return TRUE; - - case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: - { - int numRows = msg.GetCommandInt(); - for ( i = 0; i < numRows; i++ ) - { - m_rowHeights.Add( m_defaultRowHeight ); - m_rowBottoms.Add( 0 ); - m_sumRowHeights += m_defaultRowHeight; - } - m_numRows += numRows; - CalcDimensions(); - } - return TRUE; - - case wxGRIDTABLE_NOTIFY_ROWS_DELETED: + case wxGRIDTABLE_NOTIFY_ROWS_DELETED: { size_t pos = msg.GetCommandInt(); int numRows = msg.GetCommandInt2(); for ( i = 0; i < numRows; i++ ) { - m_sumRowHeights -= m_rowHeights[ pos ]; m_rowHeights.Remove( pos ); m_rowBottoms.Remove( pos ); } m_numRows -= numRows; - // TODO: improve these adjustments... - // - if ( m_scrollPosY >= m_numRows ) - m_scrollPosY = 0; - if ( !m_numRows ) { m_numCols = 0; @@ -1074,10 +1212,19 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_colRights.Clear(); m_currentCellCoords = wxGridNoCellCoords; } - else if ( m_currentCellCoords.GetRow() >= m_numRows ) + else { - m_currentCellCoords.Set( 0, 0 ); + if ( m_currentCellCoords.GetRow() >= m_numRows ) + m_currentCellCoords.Set( 0, 0 ); + + int h = 0; + for ( i = 0; i < m_numRows; i++ ) + { + h += m_rowHeights[i]; + m_rowBottoms[i] = h; + } } + CalcDimensions(); } return TRUE; @@ -1090,9 +1237,17 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) { m_colWidths.Insert( m_defaultColWidth, pos ); m_colRights.Insert( 0, pos ); - m_sumColWidths += m_defaultColWidth; } m_numCols += numCols; + + int right = 0; + if ( pos > 0 ) right = m_colRights[pos-1]; + + for ( i = pos; i < m_numCols; i++ ) + { + right += m_colWidths[i]; + m_colRights[i] = right; + } CalcDimensions(); } return TRUE; @@ -1104,9 +1259,19 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) { m_colWidths.Add( m_defaultColWidth ); m_colRights.Add( 0 ); - m_sumColWidths += m_defaultColWidth; } + + int oldNumCols = m_numCols; m_numCols += numCols; + + int right = 0; + if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1]; + + for ( i = oldNumCols; i < m_numCols; i++ ) + { + right += m_colWidths[i]; + m_colRights[i] = right; + } CalcDimensions(); } return TRUE; @@ -1117,16 +1282,10 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) int numCols = msg.GetCommandInt2(); for ( i = 0; i < numCols; i++ ) { - m_sumColWidths -= m_colWidths[ pos ]; m_colWidths.Remove( pos ); m_colRights.Remove( pos ); } m_numCols -= numCols; - // - // TODO: improve these adjustments... - // - if ( m_scrollPosX >= m_numCols ) - m_scrollPosX = 0; if ( !m_numCols ) { @@ -1137,9 +1296,17 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) #endif m_currentCellCoords = wxGridNoCellCoords; } - else if ( m_currentCellCoords.GetCol() >= m_numCols ) + else { - m_currentCellCoords.Set( 0, 0 ); + if ( m_currentCellCoords.GetCol() >= m_numCols ) + m_currentCellCoords.Set( 0, 0 ); + + int w = 0; + for ( i = 0; i < m_numCols; i++ ) + { + w += m_colWidths[i]; + m_colRights[i] = w; + } } CalcDimensions(); } @@ -1150,234 +1317,196 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) } -// -// ----- event handlers -// - -// Generate a grid event based on a mouse event and -// return the result of ProcessEvent() -// -bool wxGrid::SendEvent( const wxEventType type, - int row, int col, - wxMouseEvent& mouseEv ) +void wxGrid::CalcRowLabelsExposed( wxRegion& reg ) { - if ( type == EVT_GRID_ROW_SIZE || - type == EVT_GRID_COL_SIZE ) - { - int rowOrCol = (row == -1 ? col : row); + wxRegionIterator iter( reg ); + wxRect r; - wxGridSizeEvent gridEvt( GetId(), - type, - this, - rowOrCol, - mouseEv.GetX(), mouseEv.GetY(), - mouseEv.ControlDown(), - mouseEv.ShiftDown(), - mouseEv.AltDown(), - mouseEv.MetaDown() ); + m_rowLabelsExposed.Empty(); - return GetEventHandler()->ProcessEvent(gridEvt); - } - else if ( type == EVT_GRID_RANGE_SELECT ) + int top, bottom; + while ( iter ) { - wxGridRangeSelectEvent gridEvt( GetId(), - type, - this, - m_selectedTopLeft, - m_selectedBottomRight, - mouseEv.ControlDown(), - mouseEv.ShiftDown(), - mouseEv.AltDown(), - mouseEv.MetaDown() ); + r = iter.GetRect(); - return GetEventHandler()->ProcessEvent(gridEvt); - } - else - { - wxGridEvent gridEvt( GetId(), - type, - this, - row, col, - mouseEv.GetX(), mouseEv.GetY(), - mouseEv.ControlDown(), - mouseEv.ShiftDown(), - mouseEv.AltDown(), - mouseEv.MetaDown() ); + // TODO: remove this when we can... + // There is a bug in wxMotif that gives garbage update + // rectangles if you jump-scroll a long way by clicking the + // scrollbar with middle button. This is a work-around + // +#if defined(__WXMOTIF__) + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); + if ( r.GetTop() > ch ) r.SetTop( 0 ); + r.SetBottom( wxMin( r.GetBottom(), ch ) ); +#endif - return GetEventHandler()->ProcessEvent(gridEvt); + // logical bounds of update region + // + int dummy; + CalcUnscrolledPosition( 0, r.GetTop(), &dummy, &top ); + CalcUnscrolledPosition( 0, r.GetBottom(), &dummy, &bottom ); + + // find the row labels within these bounds + // + int row; + int rowTop; + for ( row = 0; row < m_numRows; row++ ) + { + if ( m_rowBottoms[row] < top ) continue; + + rowTop = m_rowBottoms[row] - m_rowHeights[row]; + if ( rowTop > bottom ) break; + + m_rowLabelsExposed.Add( row ); + } + + iter++ ; } } -// Generate a grid event of specified type and return the result -// of ProcessEvent(). -// -bool wxGrid::SendEvent( const wxEventType type, - int row, int col ) +void wxGrid::CalcColLabelsExposed( wxRegion& reg ) { - if ( type == EVT_GRID_ROW_SIZE || - type == EVT_GRID_COL_SIZE ) - { - int rowOrCol = (row == -1 ? col : row); + wxRegionIterator iter( reg ); + wxRect r; - wxGridSizeEvent gridEvt( GetId(), - type, - this, - rowOrCol ); + m_colLabelsExposed.Empty(); - return GetEventHandler()->ProcessEvent(gridEvt); - } - else + int left, right; + while ( iter ) { - wxGridEvent gridEvt( GetId(), - type, - this, - row, col ); + r = iter.GetRect(); - return GetEventHandler()->ProcessEvent(gridEvt); + // TODO: remove this when we can... + // There is a bug in wxMotif that gives garbage update + // rectangles if you jump-scroll a long way by clicking the + // scrollbar with middle button. This is a work-around + // +#if defined(__WXMOTIF__) + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); + if ( r.GetLeft() > cw ) r.SetLeft( 0 ); + r.SetRight( wxMin( r.GetRight(), cw ) ); +#endif + + // logical bounds of update region + // + int dummy; + CalcUnscrolledPosition( r.GetLeft(), 0, &left, &dummy ); + CalcUnscrolledPosition( r.GetRight(), 0, &right, &dummy ); + + // find the cells within these bounds + // + int col; + int colLeft; + for ( col = 0; col < m_numCols; col++ ) + { + if ( m_colRights[col] < left ) continue; + + colLeft = m_colRights[col] - m_colWidths[col]; + if ( colLeft > right ) break; + + m_colLabelsExposed.Add( col ); + } + + iter++ ; } } -void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(ev) ) +void wxGrid::CalcCellsExposed( wxRegion& reg ) { - wxPaintDC dc( this ); + wxRegionIterator iter( reg ); + wxRect r; - if ( !m_batchCount ) - { - // define a clipping region to avoid painting over the scroll bars - // - int vs = 0; - if ( m_vertScrollBar && m_vertScrollBar->IsShown() ) - vs = m_scrollBarWidth; + m_cellsExposed.Empty(); + m_rowsExposed.Empty(); + m_colsExposed.Empty(); - int hs = 0; - if ( m_horizScrollBar && m_horizScrollBar->IsShown() ) - hs = m_scrollBarWidth; + int left, top, right, bottom; + while ( iter ) + { + r = iter.GetRect(); + // TODO: remove this when we can... + // There is a bug in wxMotif that gives garbage update + // rectangles if you jump-scroll a long way by clicking the + // scrollbar with middle button. This is a work-around + // +#if defined(__WXMOTIF__) int cw, ch; - GetClientSize( &cw, &ch ); - dc.SetClippingRegion( 0, 0, cw - vs, ch - hs ); - - HideCurrentCellHighlight( dc ); + m_gridWin->GetClientSize( &cw, &ch ); + if ( r.GetTop() > ch ) r.SetTop( 0 ); + if ( r.GetLeft() > cw ) r.SetLeft( 0 ); + r.SetRight( wxMin( r.GetRight(), cw ) ); + r.SetBottom( wxMin( r.GetBottom(), ch ) ); +#endif - DrawLabelAreas( dc ); - DrawColLabels( dc ); - DrawRowLabels( dc ); - DrawCellArea( dc ); - DrawGridLines( dc ); - DrawCells( dc ); + // logical bounds of update region + // + CalcUnscrolledPosition( r.GetLeft(), r.GetTop(), &left, &top ); + CalcUnscrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom ); - // TODO: something more elegant than this... + // find the cells within these bounds // - if ( m_firstPaint ) + int row, col; + int colLeft, rowTop; + for ( row = 0; row < m_numRows; row++ ) { - if ( m_currentCellCoords == wxGridNoCellCoords ) - m_currentCellCoords.Set(0, 0); + if ( m_rowBottoms[row] < top ) continue; - SetEditControlValue(); - ShowCellEditControl(); - m_firstPaint = FALSE; - } + rowTop = m_rowBottoms[row] - m_rowHeights[row]; + if ( rowTop > bottom ) break; - ShowCurrentCellHighlight( dc ); + m_rowsExposed.Add( row ); - dc.DestroyClippingRegion(); - } -} + for ( col = 0; col < m_numCols; col++ ) + { + if ( m_colRights[col] < left ) continue; + colLeft = m_colRights[col] - m_colWidths[col]; + if ( colLeft > right ) break; -void wxGrid::OnSize( wxSizeEvent& WXUNUSED(ev) ) -{ - if ( m_created ) CalcDimensions(); + if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) m_colsExposed.Add( col ); + m_cellsExposed.Add( wxGridCellCoords( row, col ) ); + } + } + + iter++ ; + } } -void wxGrid::OnMouse( wxMouseEvent& ev ) +void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { - int x = ev.GetX(); - int y = ev.GetY(); - int row, col; + int x, y, row; + wxPoint pos( event.GetPosition() ); + CalcUnscrolledPosition( pos.x, pos.y, &x, &y ); - // ------------------------------------------------------------ - // - // Mouse dragging - // - if ( ev.Dragging() ) + if ( event.Dragging() ) { m_isDragging = TRUE; - if ( ev.LeftIsDown() ) + if ( event.LeftIsDown() ) { switch( m_cursorMode ) { - case WXGRID_CURSOR_SELECT_CELL: - { - wxGridCellCoords cellCoords; - XYToCell( x, y, cellCoords ); - if ( cellCoords != wxGridNoCellCoords ) - { - if ( !IsSelection() ) - { - SelectBlock( cellCoords, cellCoords ); - } - else - { - // check for the mouse being outside the cell area - // (we still want to let the user grow the selected block) - // - if ( cellCoords.GetCol() == -1 ) - { - if ( x >= m_right ) - cellCoords.SetCol( m_numCols-1 ); - else - cellCoords.SetCol( m_scrollPosX ); - } - - if ( cellCoords.GetRow() == -1 ) - { - if ( y >= m_bottom ) - cellCoords.SetRow( m_numRows-1 ); - else - cellCoords.SetRow( m_scrollPosY ); - } - - if ( !IsInSelection( cellCoords ) ) - SelectBlock( m_currentCellCoords, cellCoords ); - } - } - } - break; - case WXGRID_CURSOR_RESIZE_ROW: { - wxClientDC dc(this); - dc.SetLogicalFunction(wxXOR); - if ( m_dragLastPos >= 0 ) - { - dc.DrawLine( m_left, m_dragLastPos, - m_right, m_dragLastPos ); - } - dc.DrawLine( m_left, ev.GetY(), - m_right, ev.GetY()); - - m_dragLastPos = ev.GetY(); - } - break; + int cw, ch, left, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &left, &dummy ); - case WXGRID_CURSOR_RESIZE_COL: - { - wxClientDC dc(this); + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { - dc.DrawLine( m_dragLastPos, m_top, - m_dragLastPos, m_bottom ); + dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); } - dc.DrawLine( ev.GetX(), m_top, - ev.GetX(), m_bottom ); - - m_dragLastPos = ev.GetX(); + dc.DrawLine( left, y, left+cw, y ); + m_dragLastPos = y; } break; @@ -1390,16 +1519,6 @@ void wxGrid::OnMouse( wxMouseEvent& ev ) } } break; - - case WXGRID_CURSOR_SELECT_COL: - { - if ( (col = XToCol( x )) >= 0 && - !IsInSelection( 0, col ) ) - { - SelectCol( col, TRUE ); - } - } - break; } } return; @@ -1407,1977 +1526,1973 @@ void wxGrid::OnMouse( wxMouseEvent& ev ) m_isDragging = FALSE; - // ------------------------------------------------------------ - // - // Left mouse button down + + // ------------ Left button pressed // - if ( ev.LeftDown() ) + if ( event.LeftDown() ) { - row = -1; - col = -1; - wxGridCellCoords cellCoords; - - switch( XYToArea( x, y ) ) + // don't send a label click event for a hit on the + // edge of the row label - this is probably the user + // wanting to resize the row + // + if ( YToEdgeOfRow(y) < 0 ) { - case WXGRID_ROWLABEL: + row = YToRow(y); + if ( row >= 0 && + !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) { - // don't send a label click event for a hit on the - // edge of the row label - this is probably the user - // wanting to resize the row - // - if ( YToEdgeOfRow(y) < 0 ) - { - row = YToRow(y); - if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) ) - { - SelectRow( row, ev.ShiftDown() ); - m_cursorMode = WXGRID_CURSOR_SELECT_ROW; - } - } + SelectRow( row, event.ShiftDown() ); + m_cursorMode = WXGRID_CURSOR_SELECT_ROW; } - break; - - case WXGRID_COLLABEL: - { - // don't send a label click event for a hit on the - // edge of the col label - this is probably the user - // wanting to resize the col - // - if ( XToEdgeOfCol(x) < 0 ) - { - col = XToCol(x); - if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) ) - { - SelectCol( col, ev.ShiftDown() ); - m_cursorMode = WXGRID_CURSOR_SELECT_COL; - } - } - } - break; - - case WXGRID_CORNERLABEL: - { - // leave both row and col as -1 - // - if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, col, ev ) ) - { - SelectAll(); - } - } - break; + } + else + { + // starting to drag-resize a row + // + m_rowLabelWin->CaptureMouse(); + } + } - case WXGRID_CELL: - { - XYToCell( x, y, cellCoords ); - if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK, - cellCoords.GetRow(), - cellCoords.GetCol(), - ev ) ) - { - MakeCellVisible( cellCoords ); - SelectCell( cellCoords ); - } - } - break; - default: -#if 0 - wxLogMessage( "outside grid area" ); -#endif - break; + // ------------ Left double click + // + else if (event.LeftDClick() ) + { + if ( YToEdgeOfRow(y) < 0 ) + { + row = YToRow(y); + SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ); } } - // ------------------------------------------------------------ - // - // Left mouse button double click + + + // ------------ Left button released // - else if ( ev.LeftDClick() ) + else if ( event.LeftUp() ) { - row = -1; - col = -1; - wxGridCellCoords cellCoords; - - switch( XYToArea( x, y ) ) + if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) { - case WXGRID_ROWLABEL: - { - // don't send a label click event for a hit on the - // edge of the row label - this is probably the user - // wanting to resize the row - // - if ( YToEdgeOfRow(y) < 0 ) - { - row = YToRow(y); - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev ); - } - } - break; + m_rowLabelWin->ReleaseMouse(); - case WXGRID_COLLABEL: + if ( m_dragLastPos >= 0 ) { - // don't send a label click event for a hit on the - // edge of the col label - this is probably the user - // wanting to resize the col + // erase the last line and resize the row // - if ( XToEdgeOfCol(x) < 0 ) + int cw, ch, left, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &left, &dummy ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction( wxINVERT ); + dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); + HideCellEditControl(); + + int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol]; + SetRowSize( m_dragRowOrCol, wxMax( y - rowTop, WXGRID_MIN_ROW_HEIGHT ) ); + if ( !GetBatchCount() ) { - col = XToCol(x); - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev ); + // 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( FALSE, &rect ); } - } - break; - case WXGRID_CORNERLABEL: - { - // leave both row and col as -1 + ShowCellEditControl(); + + // Note: we are ending the event *after* doing + // default processing in this case // - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, col, ev ); + SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); } - break; + } - case WXGRID_CELL: - { - XYToCell( x, y, cellCoords ); - SendEvent( EVT_GRID_CELL_LEFT_DCLICK, - cellCoords.GetRow(), - cellCoords.GetCol(), - ev ); - } - break; + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + m_dragLastPos = -1; + } - default: -#if 0 - wxLogMessage( "outside grid area" ); -#endif - break; + + // ------------ Right button down + // + else if ( event.RightDown() ) + { + row = YToRow(y); + if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) + { + // no default action at the moment } } - // ------------------------------------------------------------ + + + // ------------ Right double click // - // Left mouse button released + else if ( event.RightDClick() ) + { + row = YToRow(y); + if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) + { + // no default action at the moment + } + } + + + // ------------ No buttons down and mouse moving // - else if ( ev.LeftUp() ) + else if ( event.Moving() ) { - switch ( m_cursorMode ) + m_dragRowOrCol = YToEdgeOfRow( y ); + if ( m_dragRowOrCol >= 0 ) { - case WXGRID_CURSOR_RESIZE_ROW: + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - if ( m_dragLastPos >= 0 ) - { - // erase the last line and resize the row - // - wxClientDC dc( this ); - dc.SetLogicalFunction( wxINVERT ); - dc.DrawLine( m_left, m_dragLastPos, - m_right, m_dragLastPos ); - HideCellEditControl(); - int top = m_top + m_colLabelHeight; - if ( m_dragRowOrCol > 0 ) - top = m_rowBottoms[m_dragRowOrCol-1]; - - m_sumRowHeights -= m_rowHeights[ m_dragRowOrCol ]; - m_rowHeights[m_dragRowOrCol] = wxMax( ev.GetY() - top, - WXGRID_MIN_ROW_HEIGHT ); - m_sumRowHeights += m_rowHeights[ m_dragRowOrCol ]; - CalcDimensions(); - ShowCellEditControl(); - Refresh(); - - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, ev ); - } + m_cursorMode = WXGRID_CURSOR_RESIZE_ROW; + m_rowLabelWin->SetCursor( m_rowResizeCursor ); } - break; + } + else + { + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + if ( m_rowLabelWin->GetCursor() == m_rowResizeCursor ) + m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR ); + } + } +} + + +void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) +{ + int x, y, col; + wxPoint pos( event.GetPosition() ); + CalcUnscrolledPosition( pos.x, pos.y, &x, &y ); + + if ( event.Dragging() ) + { + m_isDragging = TRUE; - case WXGRID_CURSOR_RESIZE_COL: + if ( event.LeftIsDown() ) + { + switch( m_cursorMode ) { - if ( m_dragLastPos >= 0 ) + case WXGRID_CURSOR_RESIZE_COL: { - // erase the last line and resize the col - // - wxClientDC dc( this ); - dc.SetLogicalFunction( wxINVERT ); - dc.DrawLine( m_left, m_dragLastPos, - m_right, m_dragLastPos ); - HideCellEditControl(); - int left = m_left + m_rowLabelWidth; - if ( m_dragRowOrCol > 0 ) - left = m_colRights[m_dragRowOrCol-1]; - - m_sumColWidths -= m_colWidths[m_dragRowOrCol]; - m_colWidths[m_dragRowOrCol] = wxMax( ev.GetX() - left, - WXGRID_MIN_COL_WIDTH ); - m_sumColWidths += m_colWidths[m_dragRowOrCol]; - - CalcDimensions(); - ShowCellEditControl(); - Refresh(); - - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, ev ); + int cw, ch, dummy, top; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &dummy, &top ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction(wxINVERT); + if ( m_dragLastPos >= 0 ) + { + dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); + } + dc.DrawLine( x, top, x, top+ch ); + m_dragLastPos = x; } - } - break; + break; - case WXGRID_CURSOR_SELECT_CELL: - { - if ( IsSelection() ) + case WXGRID_CURSOR_SELECT_COL: { - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, ev ); + if ( (col = XToCol( x )) >= 0 && + !IsInSelection( 0, col ) ) + { + SelectCol( col, TRUE ); + } } + break; } - break; } - - m_dragLastPos = -1; + return; } - // ------------------------------------------------------------ + + m_isDragging = FALSE; + + + // ------------ Left button pressed // - // Right mouse button down + if ( event.LeftDown() ) + { + // don't send a label click event for a hit on the + // edge of the col label - this is probably the user + // wanting to resize the col + // + if ( XToEdgeOfCol(x) < 0 ) + { + col = XToCol(x); + if ( col >= 0 && + !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) + { + SelectCol( col, event.ShiftDown() ); + m_cursorMode = WXGRID_CURSOR_SELECT_COL; + } + } + else + { + // starting to drag-resize a col + // + m_colLabelWin->CaptureMouse(); + } + } + + + // ------------ Left double click // - else if ( ev.RightDown() ) + if ( event.LeftDClick() ) { - row = -1; - col = -1; - wxGridCellCoords cellCoords; + if ( XToEdgeOfCol(x) < 0 ) + { + col = XToCol(x); + SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ); + } + } + - switch( XYToArea( x, y ) ) + // ------------ Left button released + // + else if ( event.LeftUp() ) + { + if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) { + m_colLabelWin->ReleaseMouse(); - case WXGRID_ROWLABEL: + if ( m_dragLastPos >= 0 ) { - row = YToRow(y); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) ) - { - // TODO: default processing ? - } - } - break; + // erase the last line and resize the col + // + int cw, ch, dummy, top; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &dummy, &top ); - case WXGRID_COLLABEL: - { - col = XToCol(x); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) ) + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction( wxINVERT ); + dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); + HideCellEditControl(); + + int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol]; + SetColSize( m_dragRowOrCol, wxMax( x - colLeft, WXGRID_MIN_COL_WIDTH ) ); + + if ( !GetBatchCount() ) { - // TODO: default processing ? + // 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( FALSE, &rect ); } - } - break; - case WXGRID_CORNERLABEL: - { - // leave both row and col as -1 + ShowCellEditControl(); + + // Note: we are ending the event *after* doing + // default processing in this case // - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, col, ev ) ) - { - // TODO: default processing ? - } + SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); } - break; + } - case WXGRID_CELL: - { - XYToCell( x, y, cellCoords ); - if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK, - cellCoords.GetRow(), - cellCoords.GetCol(), - ev ) ) - { - // TODO: default processing ? - } - } - break; + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + m_dragLastPos = -1; + } - default: -#if 0 - wxLogMessage( "outside grid area" ); -#endif - break; + + // ------------ Right button down + // + else if ( event.RightDown() ) + { + col = XToCol(x); + if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) + { + // no default action at the moment } } - // ------------------------------------------------------------ - // - // Right mouse button double click + + + // ------------ Right double click // - else if ( ev.RightDClick() ) + else if ( event.RightDClick() ) { - row = -1; - col = -1; - wxGridCellCoords cellCoords; - - switch( XYToArea( x, y ) ) + col = XToCol(x); + if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) { + // no default action at the moment + } + } - case WXGRID_ROWLABEL: - { - row = YToRow(y); - SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev ); - } - break; - case WXGRID_COLLABEL: + // ------------ No buttons down and mouse moving + // + else if ( event.Moving() ) + { + m_dragRowOrCol = XToEdgeOfCol( x ); + if ( m_dragRowOrCol >= 0 ) + { + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - col = XToCol(x); - SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev ); + m_cursorMode = WXGRID_CURSOR_RESIZE_COL; + m_colLabelWin->SetCursor( m_colResizeCursor ); } - break; + } + else + { + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + if ( m_colLabelWin->GetCursor() == m_colResizeCursor ) + m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR ); + } + } +} - case WXGRID_CORNERLABEL: - { - // leave both row and col as -1 - // - SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, col, ev ); - } - break; - case WXGRID_CELL: - { - XYToCell( x, y, cellCoords ); - SendEvent( EVT_GRID_CELL_RIGHT_DCLICK, - cellCoords.GetRow(), - cellCoords.GetCol(), - ev ); - } - break; +void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) +{ + if ( event.LeftDown() ) + { + // indicate corner label by having both row and + // col args == -1 + // + if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) ) + { + SelectAll(); + } + } - default: -#if 0 - wxLogMessage( "outside grid area" ); -#endif - break; + else if ( event.LeftDClick() ) + { + SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event ); + } + + else if ( event.RightDown() ) + { + if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) ) + { + // no default action at the moment } } - // ------------------------------------------------------------ - // - // No buttons down and mouse moving - // - else if ( ev.Moving() ) + + else if ( event.RightDClick() ) + { + if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) ) + { + // no default action at the moment + } + } +} + + +void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) +{ + int x, y; + wxPoint pos( event.GetPosition() ); + CalcUnscrolledPosition( pos.x, pos.y, &x, &y ); + + wxGridCellCoords coords; + XYToCell( x, y, coords ); + + if ( event.Dragging() ) { - switch( XYToArea( x, y ) ) + m_isDragging = TRUE; + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - case WXGRID_ROWLABEL: + // Hide the edit control, so it + // won't interfer with drag-shrinking. + if ( IsCellEditControlEnabled() ) + HideCellEditControl(); + if ( coords != wxGridNoCellCoords ) { - m_dragRowOrCol = YToEdgeOfRow( y ); - if ( m_dragRowOrCol >= 0 ) + if ( !IsSelection() ) { - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { - m_cursorMode = WXGRID_CURSOR_RESIZE_ROW; - SetCursor( m_rowResizeCursor ); - } + SelectBlock( coords, coords ); } else { - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - SetCursor( *wxSTANDARD_CURSOR ); - } + SelectBlock( m_currentCellCoords, coords ); } } - break; + } + + return; + } - case WXGRID_COLLABEL: + m_isDragging = FALSE; + + if ( coords != wxGridNoCellCoords ) + { + if ( event.LeftDown() ) + { + if ( event.ShiftDown() ) { - m_dragRowOrCol = XToEdgeOfCol( x ); - if ( m_dragRowOrCol >= 0 ) - { - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { - m_cursorMode = WXGRID_CURSOR_RESIZE_COL; - SetCursor( m_colResizeCursor ); - } - } - else - { - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - SetCursor( *wxSTANDARD_CURSOR ); - } - } + SelectBlock( m_currentCellCoords, coords ); } - break; - - default: + else { - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) + if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK, + coords.GetRow(), + coords.GetCol(), + event ) ) { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - SetCursor( *wxSTANDARD_CURSOR ); + MakeCellVisible( coords ); + SetCurrentCell( coords ); } } - break; } - } -} -void wxGrid::OnKeyDown( wxKeyEvent& ev ) -{ - if ( m_inOnKeyDown ) - { - // shouldn't be here - we are going round in circles... + // ------------ Left double click // - wxLogFatalError( wxT("wxGrid::OnKeyDown called while alread active") ); - } - - m_inOnKeyDown = TRUE; + else if ( event.LeftDClick() ) + { + SendEvent( EVT_GRID_CELL_LEFT_DCLICK, + coords.GetRow(), + coords.GetCol(), + event ); + } - // propagate the event up and see if it gets processed - // - wxWindow *parent = GetParent(); - wxKeyEvent keyEvt( ev ); - keyEvt.SetEventObject( parent ); - if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) ) - { - // try local handlers + // ------------ Left button released // - switch ( ev.KeyCode() ) + else if ( event.LeftUp() ) { - case WXK_UP: - if ( ev.ControlDown() ) - { - MoveCursorUpBlock(); - } - else - { - MoveCursorUp(); - } - break; - - case WXK_DOWN: - if ( ev.ControlDown() ) - { - MoveCursorDownBlock(); - } - else - { - MoveCursorDown(); - } - break; - - case WXK_LEFT: - if ( ev.ControlDown() ) - { - MoveCursorLeftBlock(); - } - else + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) + { + if ( IsSelection() ) { - MoveCursorLeft(); + SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event ); } - break; + } - case WXK_RIGHT: - if ( ev.ControlDown() ) - { - MoveCursorRightBlock(); - } - else - { - MoveCursorRight(); - } - break; + // Show the edit control, if it has + // been hidden for drag-shrinking. + if ( IsCellEditControlEnabled() ) + ShowCellEditControl(); - case WXK_RETURN: - MoveCursorDown(); - break; + m_dragLastPos = -1; + } - case WXK_HOME: - if ( ev.ControlDown() ) - { - MakeCellVisible( 0, 0 ); - SelectCell( 0, 0 ); - } - else - { - ev.Skip(); - } - break; - case WXK_END: - if ( ev.ControlDown() ) - { - MakeCellVisible( m_numRows-1, m_numCols-1 ); - SelectCell( m_numRows-1, m_numCols-1 ); - } - else - { - ev.Skip(); - } - break; + // ------------ Right button down + // + else if ( event.RightDown() ) + { + if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK, + coords.GetRow(), + coords.GetCol(), + event ) ) + { + // no default action at the moment + } + } - case WXK_PRIOR: - MovePageUp(); - break; - case WXK_NEXT: - MovePageDown(); - break; + // ------------ Right double click + // + else if ( event.RightDClick() ) + { + if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK, + coords.GetRow(), + coords.GetCol(), + event ) ) + { + // no default action at the moment + } + } - default: - // now try the cell edit control - // - if ( IsCellEditControlEnabled() ) - { - ev.SetEventObject( m_cellEditCtrl ); - m_cellEditCtrl->GetEventHandler()->ProcessEvent( ev ); - } - break; + // ------------ Moving and no button action + // + else if ( event.Moving() && !event.IsButton() ) + { + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; } } - - m_inOnKeyDown = FALSE; } -// Text updated in an edit control - either a text control or a -// combo box // -void wxGrid::OnText( wxCommandEvent& ev ) +// ------ interaction with data model +// +bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg ) { - if ( !m_inOnText ) + switch ( msg.GetId() ) { - m_inOnText = TRUE; - wxWindow *ctrl = (wxWindow *)ev.GetEventObject(); - - if ( ctrl == m_cellEditCtrl && - IsTopEditControlEnabled() ) - { - // set the value of the top edit control - // - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - ((wxTextCtrl *)m_topEditCtrl)-> - SetValue(((wxTextCtrl *)ctrl)->GetValue()); - break; + case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES: + return GetModelValues(); - case wxGRID_COMBOBOX: - ((wxComboBox *)m_topEditCtrl)-> - SetValue(((wxComboBox *)ctrl)->GetValue()); - break; - } - } - else if ( ctrl == m_topEditCtrl ) - { - if ( IsCellEditControlEnabled() ) - { - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - ((wxTextCtrl *)m_cellEditCtrl)-> - SetValue(((wxTextCtrl *)ctrl)->GetValue()); - break; + case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES: + return SetModelValues(); - case wxGRID_COMBOBOX: - ((wxComboBox *)m_cellEditCtrl)-> - SetValue(((wxComboBox *)ctrl)->GetValue()); - break; - } - } - else - { - // in the case when in-place editing is turned off we just want to - // echo the text changes in the cell but not yet update the grid table - // - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - DrawCellValue( m_currentCellCoords, ((wxTextCtrl *)ctrl)->GetValue() ); - break; + case wxGRIDTABLE_NOTIFY_ROWS_INSERTED: + case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: + case wxGRIDTABLE_NOTIFY_ROWS_DELETED: + case wxGRIDTABLE_NOTIFY_COLS_INSERTED: + case wxGRIDTABLE_NOTIFY_COLS_APPENDED: + case wxGRIDTABLE_NOTIFY_COLS_DELETED: + return Redimension( msg ); - case wxGRID_COMBOBOX: - DrawCellValue( m_currentCellCoords, ((wxComboBox *)ctrl)->GetValue() ); - break; - } - } - } + default: + return FALSE; } +} + + - m_inOnText = FALSE; +// The behaviour of this function depends on the grid table class +// Clear() function. For the default wxGridStringTable class the +// behavious is to replace all cell contents with wxEmptyString but +// not to change the number of rows or cols. +// +void wxGrid::ClearGrid() +{ + if ( m_table ) + { + m_table->Clear(); + SetEditControlValue(); + if ( !GetBatchCount() ) m_gridWin->Refresh(); + } } -void wxGrid::OnGridScroll( wxScrollEvent& ev ) + +bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) { - // propagate the event up and see if it gets processed - // - wxWindow *parent = GetParent(); - wxScrollEvent scrollEvt( ev ); - if (parent->GetEventHandler()->ProcessEvent( scrollEvt )) return; + // TODO: something with updateLabels flag - HideCellEditControl(); + if ( !m_created ) + { + wxLogError( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); + return FALSE; + } - if ( ev.GetEventObject() == m_horizScrollBar ) + if ( m_table ) { - if ( ev.GetPosition() != m_scrollPosX ) + bool ok = m_table->InsertRows( pos, numRows ); + + // the table will have sent the results of the insert row + // operation to this view object as a grid table message + // + if ( ok ) { - SetHorizontalScrollPos( ev.GetPosition() ); + if ( m_numCols == 0 ) + { + m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS ); + // + // TODO: perhaps instead of appending the default number of cols + // we should remember what the last non-zero number of cols was ? + // + } + + if ( m_currentCellCoords == wxGridNoCellCoords ) + { + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); + } + + ClearSelection(); + if ( !GetBatchCount() ) Refresh(); } + + SetEditControlValue(); + return ok; } else { - if ( ev.GetPosition() != m_scrollPosY ) - { - SetVerticalScrollPos( ev.GetPosition() ); - } + return FALSE; } - - ShowCellEditControl(); } -void wxGrid::SelectCell( const wxGridCellCoords& coords ) +bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) { - if ( SendEvent( EVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) ) - { - // the event has been intercepted - do nothing - return; - } - - wxClientDC dc( this ); + // TODO: something with updateLabels flag - if ( m_currentCellCoords != wxGridNoCellCoords ) + if ( !m_created ) { - HideCurrentCellHighlight( dc ); - HideCellEditControl(); - SaveEditControlValue(); + wxLogError( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); + return FALSE; } - m_currentCellCoords = coords; - - SetEditControlValue(); - if ( IsOnScreen() ) + if ( m_table && m_table->AppendRows( numRows ) ) { - ShowCellEditControl(); - ShowCurrentCellHighlight( dc ); - } + if ( m_currentCellCoords == wxGridNoCellCoords ) + { + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); + } - if ( IsSelection() ) - { + // the table will have sent the results of the append row + // operation to this view object as a grid table message + // ClearSelection(); if ( !GetBatchCount() ) Refresh(); + return TRUE; + } + else + { + return FALSE; } } -void wxGrid::ShowCellEditControl() +bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) { - wxRect rect; + // TODO: something with updateLabels flag - if ( IsCellEditControlEnabled() ) + if ( !m_created ) { - if ( !IsVisible( m_currentCellCoords ) ) - { - return; - } - else - { - rect = CellToRect( m_currentCellCoords ); + wxLogError( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") ); + return FALSE; + } - m_cellEditCtrl->SetSize( rect ); - m_cellEditCtrl->Show( TRUE ); + if ( m_table && m_table->DeleteRows( pos, numRows ) ) + { + // the table will have sent the results of the delete row + // operation to this view object as a grid table message + // + if ( m_numRows > 0 ) + SetEditControlValue(); + else + HideCellEditControl(); - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - ((wxTextCtrl *) m_cellEditCtrl)->SetInsertionPointEnd(); - break; + ClearSelection(); + if ( !GetBatchCount() ) Refresh(); + return TRUE; + } + else + { + return FALSE; + } +} - case wxGRID_CHECKBOX: - // TODO: anything ??? - // - break; - case wxGRID_CHOICE: - // TODO: anything ??? - // - break; +bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) +{ + // TODO: something with updateLabels flag - case wxGRID_COMBOBOX: - // TODO: anything ??? - // - break; + if ( !m_created ) + { + wxLogError( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") ); + return FALSE; + } + + if ( m_table ) + { + HideCellEditControl(); + bool ok = m_table->InsertCols( pos, numCols ); + + // the table will have sent the results of the insert col + // operation to this view object as a grid table message + // + if ( ok ) + { + if ( m_currentCellCoords == wxGridNoCellCoords ) + { + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); } - m_cellEditCtrl->SetFocus(); + ClearSelection(); + if ( !GetBatchCount() ) Refresh(); } + + SetEditControlValue(); + return ok; + } + else + { + return FALSE; } } -void wxGrid::HideCellEditControl() +bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) { - if ( IsCellEditControlEnabled() ) + // TODO: something with updateLabels flag + + if ( !m_created ) { - m_cellEditCtrl->Show( FALSE ); + wxLogError( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") ); + return FALSE; + } + + if ( m_table && m_table->AppendCols( numCols ) ) + { + // the table will have sent the results of the append col + // operation to this view object as a grid table message + // + if ( m_currentCellCoords == wxGridNoCellCoords ) + { + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); + } + + ClearSelection(); + if ( !GetBatchCount() ) Refresh(); + return TRUE; + } + else + { + return FALSE; } } -void wxGrid::SetEditControlValue( const wxString& value ) + +bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) { - if ( m_table ) + // TODO: something with updateLabels flag + + if ( !m_created ) { - wxString s; - if ( !value ) - s = GetCellValue(m_currentCellCoords); + wxLogError( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") ); + return FALSE; + } + + if ( m_table && m_table->DeleteCols( pos, numCols ) ) + { + // the table will have sent the results of the delete col + // operation to this view object as a grid table message + // + if ( m_numCols > 0 ) + SetEditControlValue(); else - s = value; + HideCellEditControl(); - if ( IsTopEditControlEnabled() ) - { - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - ((wxGridTextCtrl *)m_topEditCtrl)->SetStartValue(s); - break; + ClearSelection(); + if ( !GetBatchCount() ) Refresh(); + return TRUE; + } + else + { + return FALSE; + } +} - case wxGRID_CHECKBOX: - // TODO: implement this - // - break; - case wxGRID_CHOICE: - // TODO: implement this - // - break; - case wxGRID_COMBOBOX: - // TODO: implement this - // - break; - } - } +// +// ----- event handlers +// - if ( IsCellEditControlEnabled() ) - { - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - ((wxGridTextCtrl *)m_cellEditCtrl)->SetStartValue(s); - break; +// Generate a grid event based on a mouse event and +// return the result of ProcessEvent() +// +bool wxGrid::SendEvent( const wxEventType type, + int row, int col, + wxMouseEvent& mouseEv ) +{ + if ( type == EVT_GRID_ROW_SIZE || + type == EVT_GRID_COL_SIZE ) + { + int rowOrCol = (row == -1 ? col : row); - case wxGRID_CHECKBOX: - // TODO: implement this - // - break; + wxGridSizeEvent gridEvt( GetId(), + type, + this, + rowOrCol, + mouseEv.GetX(), mouseEv.GetY(), + mouseEv.ControlDown(), + mouseEv.ShiftDown(), + mouseEv.AltDown(), + mouseEv.MetaDown() ); - case wxGRID_CHOICE: - // TODO: implement this - // - break; + return GetEventHandler()->ProcessEvent(gridEvt); + } + else if ( type == EVT_GRID_RANGE_SELECT ) + { + wxGridRangeSelectEvent gridEvt( GetId(), + type, + this, + m_selectedTopLeft, + m_selectedBottomRight, + mouseEv.ControlDown(), + mouseEv.ShiftDown(), + mouseEv.AltDown(), + mouseEv.MetaDown() ); - case wxGRID_COMBOBOX: - // TODO: implement this - // - break; - } - } + return GetEventHandler()->ProcessEvent(gridEvt); + } + else + { + wxGridEvent gridEvt( GetId(), + type, + this, + row, col, + mouseEv.GetX(), mouseEv.GetY(), + mouseEv.ControlDown(), + mouseEv.ShiftDown(), + mouseEv.AltDown(), + mouseEv.MetaDown() ); + + return GetEventHandler()->ProcessEvent(gridEvt); } } -void wxGrid::SaveEditControlValue() + +// Generate a grid event of specified type and return the result +// of ProcessEvent(). +// +bool wxGrid::SendEvent( const wxEventType type, + int row, int col ) { - if ( m_table ) + if ( type == EVT_GRID_ROW_SIZE || + type == EVT_GRID_COL_SIZE ) { - wxWindow *ctrl = (wxWindow *)NULL; + int rowOrCol = (row == -1 ? col : row); - if ( IsCellEditControlEnabled() ) - { - ctrl = m_cellEditCtrl; - } - else if ( IsTopEditControlEnabled() ) - { - ctrl = m_topEditCtrl; - } - else - { - return; - } + wxGridSizeEvent gridEvt( GetId(), + type, + this, + rowOrCol ); - bool valueChanged = FALSE; + return GetEventHandler()->ProcessEvent(gridEvt); + } + else + { + wxGridEvent gridEvt( GetId(), + type, + this, + row, col ); - switch ( m_editCtrlType ) + return GetEventHandler()->ProcessEvent(gridEvt); + } +} + + +void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) +{ + wxPaintDC dc( this ); + + if ( m_currentCellCoords == wxGridNoCellCoords && + m_numRows && m_numCols ) + { + m_currentCellCoords.Set(0, 0); + SetEditControlValue(); + ShowCellEditControl(); + } +} + + +// This is just here to make sure that CalcDimensions gets called when +// the grid view is resized... then the size event is skipped to allow +// the box sizers to handle everything +// +void wxGrid::OnSize( wxSizeEvent& event ) +{ + CalcDimensions(); + event.Skip(); +} + + +void wxGrid::OnKeyDown( wxKeyEvent& event ) +{ + if ( m_inOnKeyDown ) + { + // shouldn't be here - we are going round in circles... + // + wxLogFatalError( wxT("wxGrid::OnKeyDown called while alread active") ); + } + + m_inOnKeyDown = TRUE; + + // propagate the event up and see if it gets processed + // + wxWindow *parent = GetParent(); + wxKeyEvent keyEvt( event ); + keyEvt.SetEventObject( parent ); + + if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) ) + { + // try local handlers + // + switch ( event.KeyCode() ) { - case wxGRID_TEXTCTRL: - valueChanged = (((wxGridTextCtrl *)ctrl)->GetValue() != - ((wxGridTextCtrl *)ctrl)->GetStartValue()); - SetCellValue( m_currentCellCoords, - ((wxTextCtrl *) ctrl)->GetValue() ); + case WXK_UP: + if ( event.ControlDown() ) + { + MoveCursorUpBlock(); + } + else + { + MoveCursorUp(); + } break; - case wxGRID_CHECKBOX: - // TODO: implement this - // + case WXK_DOWN: + if ( event.ControlDown() ) + { + MoveCursorDownBlock(); + } + else + { + MoveCursorDown(); + } + break; + + case WXK_LEFT: + if ( event.ControlDown() ) + { + MoveCursorLeftBlock(); + } + else + { + MoveCursorLeft(); + } + break; + + case WXK_RIGHT: + if ( event.ControlDown() ) + { + MoveCursorRightBlock(); + } + else + { + MoveCursorRight(); + } + break; + + case WXK_SPACE: + if ( !IsEditable() ) + { + MoveCursorRight(); + } + else + { + event.Skip(); + } + break; + + case WXK_RETURN: + if ( event.ControlDown() ) + { + event.Skip(); // to let the edit control have the return + } + else + { + MoveCursorDown(); + } + break; + + case WXK_HOME: + if ( event.ControlDown() ) + { + MakeCellVisible( 0, 0 ); + SetCurrentCell( 0, 0 ); + } + else + { + event.Skip(); + } + break; + + case WXK_END: + if ( event.ControlDown() ) + { + MakeCellVisible( m_numRows-1, m_numCols-1 ); + SetCurrentCell( m_numRows-1, m_numCols-1 ); + } + else + { + event.Skip(); + } + break; + + case WXK_PRIOR: + MovePageUp(); break; - case wxGRID_CHOICE: - // TODO: implement this - // + case WXK_NEXT: + MovePageDown(); break; - case wxGRID_COMBOBOX: - // TODO: implement this + default: + // now try the cell edit control // + if ( IsCellEditControlEnabled() ) + { + event.SetEventObject( m_cellEditCtrl ); + m_cellEditCtrl->GetEventHandler()->ProcessEvent( event ); + } break; } - - if ( valueChanged ) - { - SendEvent( EVT_GRID_CELL_CHANGE, - m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() ); - } } + + m_inOnKeyDown = FALSE; } -int wxGrid::XYToArea( int x, int y ) +void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) { - if ( x > m_left && x < m_right && - y > m_top && y < m_bottom ) + if ( SendEvent( EVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) ) { - if ( y < m_top + m_colLabelHeight ) - { - if ( x > m_left + m_rowLabelWidth ) - { - return WXGRID_COLLABEL; - } - else - { - return WXGRID_CORNERLABEL; - } - } - else if ( x <= m_left + m_rowLabelWidth ) - { - return WXGRID_ROWLABEL; - } - else - { - return WXGRID_CELL; - } + // the event has been intercepted - do nothing + return; } - return WXGRID_NOAREA; -} - - -void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) -{ - coords.SetRow( YToRow(y) ); - coords.SetCol( XToCol(x) ); -} - - -int wxGrid::YToRow( int y ) -{ - int i; + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); - if ( y > m_top + m_colLabelHeight ) + if ( m_currentCellCoords != wxGridNoCellCoords ) { - for ( i = m_scrollPosY; i < m_numRows; i++ ) - { - if ( y < m_rowBottoms[i] ) - { - return i; - } - } + HideCellEditControl(); + SaveEditControlValue(); } - return -1; -} - + m_currentCellCoords = coords; -int wxGrid::XToCol( int x ) -{ - int i; + SetEditControlValue(); + ShowCellEditControl(); - if ( x > m_left + m_rowLabelWidth ) + if ( IsSelection() ) { - for ( i = m_scrollPosX; i < m_numCols; i++ ) - { - if ( x < m_colRights[i] ) - { - return i; - } - } + wxRect r( SelectionToDeviceRect() ); + ClearSelection(); + if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r ); } - - return -1; } -// return the row number that that the y coord is near the edge of, or -// -1 if not near an edge // -int wxGrid::YToEdgeOfRow( int y ) -{ - int i, d; +// ------ functions to get/send data (see also public functions) +// - if ( y > m_top + m_colLabelHeight ) +bool wxGrid::GetModelValues() +{ + if ( m_table ) { - for ( i = m_scrollPosY; i < m_numRows; i++ ) - { - if ( m_rowHeights[i] > WXGRID_LABEL_EDGE_ZONE ) - { - d = abs( y - m_rowBottoms[i] ); - { - if ( d < WXGRID_LABEL_EDGE_ZONE ) return i; - } - } - } + // all we need to do is repaint the grid + // + m_gridWin->Refresh(); + return TRUE; } - return -1; - + return FALSE; } -// return the col number that that the x coord is near the edge of, or -// -1 if not near an edge -// -int wxGrid::XToEdgeOfCol( int x ) +bool wxGrid::SetModelValues() { - int i, d; + int row, col; - if ( x > m_left + m_rowLabelWidth ) + if ( m_table ) { - for ( i = m_scrollPosX; i < m_numCols; i++ ) + for ( row = 0; row < m_numRows; row++ ) { - if ( m_colWidths[i] > WXGRID_LABEL_EDGE_ZONE ) + for ( col = 0; col < m_numCols; col++ ) { - d = abs( x - m_colRights[i] ); - { - if ( d < WXGRID_LABEL_EDGE_ZONE ) return i; - } + m_table->SetValue( row, col, GetCellValue(row, col) ); } } - } - return -1; + return TRUE; + } + return FALSE; } -wxRect wxGrid::CellToRect( int row, int col ) + +// Note - this function only draws cells that are in the list of +// exposed cells (usually set from the update region by +// CalcExposedCells) +// +void wxGrid::DrawGridCellArea( wxDC& dc ) { - wxRect rect( -1, -1, -1, -1 ); + if ( !m_numRows || !m_numCols ) return; + + size_t i; + size_t numCells = m_cellsExposed.GetCount(); - if ( row >= m_scrollPosY && col >= m_scrollPosX ) + for ( i = 0; i < numCells; i++ ) { - 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 ]; + DrawCell( dc, m_cellsExposed[i] ); } - - return rect; } -bool wxGrid::MoveCursorUp() +void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) { - if ( m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetRow() > 0 ) - { - SelectCell( m_currentCellCoords.GetRow() - 1, - m_currentCellCoords.GetCol() ); + if ( m_colWidths[coords.GetCol()] <=0 || + m_rowHeights[coords.GetRow()] <= 0 ) return; - if ( !IsVisible( m_currentCellCoords ) ) - MakeCellVisible( m_currentCellCoords ); +#if !WXGRID_DRAW_LINES + if ( m_gridLinesEnabled ) + DrawCellBorder( dc, coords ); +#endif - return TRUE; - } + DrawCellBackground( dc, coords ); - return FALSE; + // TODO: separate functions here for different kinds of cells ? + // e.g. text, image + // + DrawCellValue( dc, coords ); } -bool wxGrid::MoveCursorDown() + +void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) { - // TODO: allow for scrolling - // - if ( m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetRow() < m_numRows-1 ) - { - SelectCell( m_currentCellCoords.GetRow() + 1, - m_currentCellCoords.GetCol() ); + if ( m_colWidths[coords.GetCol()] <=0 || + m_rowHeights[coords.GetRow()] <= 0 ) return; - if ( !IsVisible( m_currentCellCoords ) ) - MakeCellVisible( m_currentCellCoords ); + dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); + int row = coords.GetRow(); + int col = coords.GetCol(); - return TRUE; - } + // right hand border + // + dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row], + m_colRights[col], m_rowBottoms[row] ); - return FALSE; + // bottom border + // + dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row], + m_colRights[col], m_rowBottoms[row] ); } -bool wxGrid::MoveCursorLeft() -{ - if ( m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetCol() > 0 ) - { - SelectCell( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() - 1 ); - if ( !IsVisible( m_currentCellCoords ) ) - MakeCellVisible( m_currentCellCoords ); +void wxGrid::DrawCellBackground( wxDC& dc, const wxGridCellCoords& coords ) +{ + if ( m_colWidths[coords.GetCol()] <=0 || + m_rowHeights[coords.GetRow()] <= 0 ) return; - return TRUE; - } + int row = coords.GetRow(); + int col = coords.GetCol(); - return FALSE; -} + dc.SetBackgroundMode( wxSOLID ); -bool wxGrid::MoveCursorRight() -{ - if ( m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetCol() < m_numCols - 1 ) + if ( IsInSelection( coords ) ) { - SelectCell( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() + 1 ); - - if ( !IsVisible( m_currentCellCoords ) ) - MakeCellVisible( m_currentCellCoords ); - - return TRUE; + // TODO: improve this + // + dc.SetBrush( *wxBLACK_BRUSH ); } - - return FALSE; -} - -bool wxGrid::MovePageUp() -{ - if ( m_currentCellCoords != wxGridNoCellCoords && - m_scrollPosY > 0 ) + else { - int row = m_currentCellCoords.GetRow(); - int y = m_rowBottoms[ row ] - m_rowHeights[ row ]; - while ( row > 0 ) - { - if ( y + m_rowHeights[row-1] > m_bottom ) break; - y += m_rowHeights[ --row ]; - } - SetVerticalScrollPos( row ); - - SelectCell( row, m_currentCellCoords.GetCol() ); - return TRUE; + dc.SetBrush( wxBrush(GetCellBackgroundColour(row, col), wxSOLID) ); } - return FALSE; + dc.SetPen( *wxTRANSPARENT_PEN ); + + dc.DrawRectangle( m_colRights[col] - m_colWidths[col] + 1, + m_rowBottoms[row] - m_rowHeights[row] + 1, + m_colWidths[col]-1, + m_rowHeights[row]-1 ); } -bool wxGrid::MovePageDown() + +void wxGrid::DrawCellValue( wxDC& dc, const wxGridCellCoords& coords ) { - if ( m_currentCellCoords != wxGridNoCellCoords && - m_scrollPosY + m_wholeRowsVisible < m_numRows ) - { - if ( m_wholeRowsVisible > 0 ) - { - SetVerticalScrollPos( m_scrollPosY + m_wholeRowsVisible ); - } - else if ( m_scrollPosY < m_numRows - 1 ) - { - SetVerticalScrollPos( m_scrollPosY + 1 ); - } - else - { - return FALSE; - } + if ( m_colWidths[coords.GetCol()] <=0 || + m_rowHeights[coords.GetRow()] <= 0 ) return; - // m_scrollPosY will have been updated - // - SelectCell( m_scrollPosY, m_currentCellCoords.GetCol() ); - return TRUE; - } + int row = coords.GetRow(); + int col = coords.GetCol(); - return FALSE; -} + dc.SetBackgroundMode( wxTRANSPARENT ); -bool wxGrid::MoveCursorUpBlock() -{ - if ( m_table && - m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetRow() > 0 ) + if ( IsInSelection( row, col ) ) { - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - - if ( m_table->IsEmptyCell(row, col) ) - { - // starting in an empty cell: find the next block of - // non-empty cells - // - while ( row > 0 ) - { - row-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; - } - } - else if ( m_table->IsEmptyCell(row-1, col) ) - { - // starting at the top of a block: find the next block - // - row--; - while ( row > 0 ) - { - row-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; - } - } - else - { - // starting within a block: find the top of the block - // - while ( row > 0 ) - { - row-- ; - if ( m_table->IsEmptyCell(row, col) ) - { - row++ ; - break; - } - } - } - - SelectCell( row, col ); + // TODO: improve this + // + dc.SetTextBackground( wxColour(0, 0, 0) ); + dc.SetTextForeground( wxColour(255, 255, 255) ); + } + else + { + dc.SetTextBackground( GetCellBackgroundColour(row, col) ); + dc.SetTextForeground( GetCellTextColour(row, col) ); + } + dc.SetFont( GetCellFont(row, col) ); - if ( !IsVisible( m_currentCellCoords ) ) - MakeCellVisible( m_currentCellCoords ); + int hAlign, vAlign; + GetCellAlignment( row, col, &hAlign, &vAlign ); - return TRUE; - } + wxRect rect; + rect.SetX( m_colRights[col] - m_colWidths[col] + 2 ); + rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 ); + rect.SetWidth( m_colWidths[col] - 4 ); + rect.SetHeight( m_rowHeights[row] - 4 ); - return FALSE; + DrawTextRectangle( dc, GetCellValue( row, col ), rect, hAlign, vAlign ); } -bool wxGrid::MoveCursorDownBlock() -{ - if ( m_table && - m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetRow() < m_numRows-1 ) - { - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - if ( m_table->IsEmptyCell(row, col) ) - { - // starting in an empty cell: find the next block of - // non-empty cells - // - while ( row < m_numRows-1 ) - { - row++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; - } - } - else if ( m_table->IsEmptyCell(row+1, col) ) - { - // starting at the bottom of a block: find the next block - // - row++; - while ( row < m_numRows-1 ) - { - row++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; - } - } - else - { - // starting within a block: find the bottom of the block - // - while ( row < m_numRows-1 ) - { - row++ ; - if ( m_table->IsEmptyCell(row, col) ) - { - row-- ; - break; - } - } - } - SelectCell( row, col ); +// TODO: remove this ??? +// This is used to redraw all grid lines e.g. when the grid line colour +// has been changed +// +void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) +{ + if ( !m_gridLinesEnabled || + !m_numRows || + !m_numCols ) return; - if ( !IsVisible( m_currentCellCoords ) ) - MakeCellVisible( m_currentCellCoords ); + int top, bottom, left, right; - return TRUE; + if (reg.IsEmpty()){ + int cw, ch; + m_gridWin->GetClientSize(&cw, &ch); + + // virtual coords of visible area + // + CalcUnscrolledPosition( 0, 0, &left, &top ); + CalcUnscrolledPosition( cw, ch, &right, &bottom ); + } + else{ + wxCoord x, y, w, h; + reg.GetBox(x, y, w, h); + CalcUnscrolledPosition( x, y, &left, &top ); + CalcUnscrolledPosition( x + w, y + h, &right, &bottom ); } - return FALSE; -} + // 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] ); -bool wxGrid::MoveCursorLeftBlock() -{ - if ( m_table && - m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetCol() > 0 ) - { - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); + dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); - if ( m_table->IsEmptyCell(row, col) ) - { - // starting in an empty cell: find the next block of - // non-empty cells - // - while ( col > 0 ) - { - col-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; - } - } - else if ( m_table->IsEmptyCell(row, col-1) ) + // horizontal grid lines + // + int i; + for ( i = 0; i < m_numRows; i++ ) + { + if ( m_rowBottoms[i] > bottom ) { - // starting at the left of a block: find the next block - // - col--; - while ( col > 0 ) - { - col-- ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; - } + break; } - else + else if ( m_rowBottoms[i] >= top ) { - // starting within a block: find the left of the block - // - while ( col > 0 ) - { - col-- ; - if ( m_table->IsEmptyCell(row, col) ) - { - col++ ; - break; - } - } + dc.DrawLine( left, m_rowBottoms[i], right, m_rowBottoms[i] ); } - - SelectCell( row, col ); - - if ( !IsVisible( m_currentCellCoords ) ) - MakeCellVisible( m_currentCellCoords ); - - return TRUE; } - return FALSE; -} -bool wxGrid::MoveCursorRightBlock() -{ - if ( m_table && - m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetCol() < m_numCols-1 ) + // vertical grid lines + // + for ( i = 0; i < m_numCols; i++ ) { - int row = m_currentCellCoords.GetRow(); - int col = m_currentCellCoords.GetCol(); - - if ( m_table->IsEmptyCell(row, col) ) - { - // starting in an empty cell: find the next block of - // non-empty cells - // - while ( col < m_numCols-1 ) - { - col++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; - } - } - else if ( m_table->IsEmptyCell(row, col+1) ) + if ( m_colRights[i] > right ) { - // starting at the right of a block: find the next block - // - col++; - while ( col < m_numCols-1 ) - { - col++ ; - if ( !(m_table->IsEmptyCell(row, col)) ) break; - } + break; } - else + else if ( m_colRights[i] >= left ) { - // starting within a block: find the right of the block - // - while ( col < m_numCols-1 ) - { - col++ ; - if ( m_table->IsEmptyCell(row, col) ) - { - col-- ; - break; - } - } + dc.DrawLine( m_colRights[i], top, m_colRights[i], bottom ); } + } +} - SelectCell( row, col ); - if ( !IsVisible( m_currentCellCoords ) ) - MakeCellVisible( m_currentCellCoords ); +void wxGrid::DrawRowLabels( wxDC& dc ) +{ + if ( !m_numRows || !m_numCols ) return; - return TRUE; - } + size_t i; + size_t numLabels = m_rowLabelsExposed.GetCount(); - return FALSE; + for ( i = 0; i < numLabels; i++ ) + { + DrawRowLabel( dc, m_rowLabelsExposed[i] ); + } } - -// -// ----- grid drawing functions -// - -void wxGrid::DrawLabelAreas( wxDC& dc ) +void wxGrid::DrawRowLabel( wxDC& dc, int row ) { - int cw, ch; - GetClientSize(&cw, &ch); + if ( m_rowHeights[row] <= 0 ) return; + + int rowTop = m_rowBottoms[row] - m_rowHeights[row]; + + dc.SetPen( *wxBLACK_PEN ); + 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, rowTop, 0, m_rowBottoms[row]-1 ); + dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop ); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush( wxBrush(GetLabelBackgroundColour(), wxSOLID) ); + dc.SetBackgroundMode( wxTRANSPARENT ); + dc.SetTextForeground( GetLabelTextColour() ); + dc.SetFont( GetLabelFont() ); - dc.DrawRectangle( m_left, m_top, - cw - m_left, m_colLabelHeight ); + int hAlign, vAlign; + GetRowLabelAlignment( &hAlign, &vAlign ); - dc.DrawRectangle( m_left, m_top, - m_rowLabelWidth, ch - m_top ); + wxRect rect; + rect.SetX( 2 ); + rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 ); + rect.SetWidth( m_rowLabelWidth - 4 ); + rect.SetHeight( m_rowHeights[row] - 4 ); + DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign ); } void wxGrid::DrawColLabels( wxDC& dc ) { - int cw, ch; - GetClientSize(&cw, &ch); + if ( !m_numRows || !m_numCols ) return; + + size_t i; + size_t numLabels = m_colLabelsExposed.GetCount(); + + for ( i = 0; i < numLabels; i++ ) + { + DrawColLabel( dc, m_colLabelsExposed[i] ); + } +} + + +void wxGrid::DrawColLabel( wxDC& dc, int col ) +{ + if ( m_colWidths[col] <= 0 ) return; + + 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-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.SetBackgroundMode( wxTRANSPARENT ); + dc.SetTextForeground( GetLabelTextColour() ); + dc.SetFont( GetLabelFont() ); - if (m_colLabelHeight == 0) return; + dc.SetBackgroundMode( wxTRANSPARENT ); + dc.SetTextForeground( GetLabelTextColour() ); + dc.SetFont( GetLabelFont() ); - DrawColLabelBorders( dc ); + int hAlign, vAlign; + GetColLabelAlignment( &hAlign, &vAlign ); wxRect rect; - rect.y = m_top + 1; - rect.height = m_colLabelHeight - 1; + rect.SetX( m_colRights[col] - m_colWidths[col] + 2 ); + rect.SetY( 2 ); + rect.SetWidth( m_colWidths[col] - 4 ); + rect.SetHeight( m_colLabelHeight - 4 ); + DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign ); +} - int labelLeft = m_left + m_rowLabelWidth; - int i; - for ( i = m_scrollPosX; i < m_numCols; i++ ) +void wxGrid::DrawTextRectangle( wxDC& dc, + const wxString& value, + const wxRect& rect, + int horizAlign, + int vertAlign ) +{ + long textWidth, textHeight; + long lineWidth, lineHeight; + wxArrayString lines; + + dc.SetClippingRegion( rect ); + StringToLines( value, lines ); + if ( lines.GetCount() ) { - if ( labelLeft > cw) break; + GetTextBoxSize( dc, lines, &textWidth, &textHeight ); + dc.GetTextExtent( lines[0], &lineWidth, &lineHeight ); + + float x, y; + switch ( horizAlign ) + { + case wxRIGHT: + x = rect.x + (rect.width - textWidth - 1); + break; + + case wxCENTRE: + x = rect.x + ((rect.width - textWidth)/2); + break; + + case wxLEFT: + default: + x = rect.x + 1; + break; + } + + switch ( vertAlign ) + { + case wxBOTTOM: + y = rect.y + (rect.height - textHeight - 1); + break; + + case wxCENTRE: + y = rect.y + ((rect.height - textHeight)/2); + break; - rect.x = 1 + labelLeft; - rect.width = m_colWidths[i]; - DrawColLabel( dc, rect, i ); + case wxTOP: + default: + y = rect.y + 1; + break; + } - labelLeft += m_colWidths[i]; + for ( size_t i = 0; i < lines.GetCount(); i++ ) + { + dc.DrawText( lines[i], (long)x, (long)y ); + y += lineHeight; + } } + + dc.DestroyClippingRegion(); } -void wxGrid::DrawColLabelBorders( wxDC& dc ) +// Split multi line text up into an array of strings. Any existing +// contents of the string array are preserved. +// +void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) { - if ( m_colLabelHeight <= 0 ) return; - - int i; - int cw, ch; - GetClientSize( &cw, &ch ); - - dc.SetPen( *wxBLACK_PEN ); - - // horizontal lines - // - dc.DrawLine( m_left, m_top, cw, m_top ); - - dc.DrawLine( m_left, m_top + m_colLabelHeight, - cw, m_top + m_colLabelHeight ); - - // vertical lines - // - int colLeft = m_left + m_rowLabelWidth; - for ( i = m_scrollPosX; i <= m_numCols; i++ ) + // TODO: this won't work for WXMAC ? (lines end with '\r') + // => use wxTextFile functions then (VZ) + int startPos = 0; + int pos; + while ( startPos < (int)value.Length() ) { - if (colLeft > cw) break; - - dc.DrawLine( colLeft, m_top, - colLeft, m_top + m_colLabelHeight); - - if ( i < m_numCols ) colLeft += m_colWidths[i]; + pos = value.Mid(startPos).Find( '\n' ); + if ( pos < 0 ) + { + break; + } + else if ( pos == 0 ) + { + lines.Add( wxEmptyString ); + } + else + { + if ( value[startPos+pos-1] == '\r' ) + { + lines.Add( value.Mid(startPos, pos-1) ); + } + else + { + lines.Add( value.Mid(startPos, pos) ); + } + } + startPos += pos+1; } - - // Draw white highlights for a 3d effect - // - dc.SetPen( *wxWHITE_PEN ); - - colLeft = m_left + m_rowLabelWidth; - for ( i = m_scrollPosX; i < m_numCols; i++ ) + if ( startPos < (int)value.Length() ) { - if (colLeft > cw) break; - - dc.DrawLine(colLeft + 1, m_top + 1, - colLeft + m_colWidths[i], m_top + 1); - - dc.DrawLine(colLeft + 1, m_top + 1, - colLeft + 1, m_top + m_colLabelHeight); - - colLeft += m_colWidths[i]; + lines.Add( value.Mid( startPos ) ); } } -void wxGrid::DrawColLabel( wxDC& dc, const wxRect& rect, int col ) +void wxGrid::GetTextBoxSize( wxDC& dc, + wxArrayString& lines, + long *width, long *height ) { - wxRect rect2; - rect2 = rect; - rect2.x += 3; - rect2.y += 2; - rect2.width -= 5; - rect2.height -= 4; + long w = 0; + long h = 0; + long lineW, lineH; - dc.SetBackgroundMode( wxTRANSPARENT ); - dc.SetTextBackground( GetLabelBackgroundColour() ); - dc.SetTextForeground( GetLabelTextColour() ); - dc.SetFont( GetLabelFont() ); + size_t i; + for ( i = 0; i < lines.GetCount(); i++ ) + { + dc.GetTextExtent( lines[i], &lineW, &lineH ); + w = wxMax( w, lineW ); + h += lineH; + } - int hAlign, vAlign; - GetColLabelAlignment( &hAlign, &vAlign ); - DrawTextRectangle( dc, GetColLabelValue( col ), rect2, hAlign, vAlign ); + *width = w; + *height = h; } -void wxGrid::DrawRowLabels( wxDC& dc ) -{ - int cw, ch; - GetClientSize(&cw, &ch); - - if (m_rowLabelWidth == 0) return; - - DrawRowLabelBorders( dc ); - - wxRect rect; - rect.x = m_left + 1; - rect.width = m_rowLabelWidth - 1; +// +// ------ Edit control functions +// - int labelTop = m_top + m_colLabelHeight; - int i; - for ( i = m_scrollPosY; i < m_numRows; i++ ) +void wxGrid::EnableEditing( bool edit ) +{ + // TODO: improve this ? + // + if ( edit != m_editable ) { - if ( labelTop > ch ) break; - - rect.y = 1 + labelTop; - rect.height = m_rowHeights[i]; - DrawRowLabel( dc, rect, i ); + m_editable = edit; - labelTop += m_rowHeights[i]; + // TODO: extend this for other edit control types + // + if ( m_editCtrlType == wxGRID_TEXTCTRL ) + { + ((wxTextCtrl *)m_cellEditCtrl)->SetEditable( m_editable ); + } } } -void wxGrid::DrawRowLabelBorders( wxDC& dc ) +#if 0 // disabled for the moment - the cell control is always active +void wxGrid::EnableCellEditControl( bool enable ) { - if ( m_rowLabelWidth <= 0 ) return; - - int i; - int cw, ch; - GetClientSize( &cw, &ch ); + if ( m_cellEditCtrl && + enable != m_cellEditCtrlEnabled ) + { + m_cellEditCtrlEnabled = enable; - dc.SetPen( *wxBLACK_PEN ); + if ( m_cellEditCtrlEnabled ) + { + SetEditControlValue(); + ShowCellEditControl(); + } + else + { + HideCellEditControl(); + SaveEditControlValue(); + } + } +} +#endif - // vertical lines - // - dc.DrawLine( m_left, m_top, m_left, ch ); - dc.DrawLine( m_left + m_rowLabelWidth, m_top, - m_left + m_rowLabelWidth, ch ); +void wxGrid::ShowCellEditControl() +{ + wxRect rect; - // horizontal lines - // - int rowTop = m_top + m_colLabelHeight; - for ( i = m_scrollPosY; i <= m_numRows; i++ ) + if ( IsCellEditControlEnabled() ) { - if ( rowTop > ch ) break; - - dc.DrawLine( m_left, rowTop, - m_left + m_rowLabelWidth, rowTop ); + if ( !IsVisible( m_currentCellCoords ) ) + { + return; + } + else + { + rect = CellToRect( m_currentCellCoords ); - if ( i < m_numRows ) rowTop += m_rowHeights[i]; - } + // convert to scrolled coords + // + int left, top, right, bottom; + CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top ); + CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom ); - // Draw white highlights for a 3d effect - // - dc.SetPen( *wxWHITE_PEN ); + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); - rowTop = m_top + m_colLabelHeight; - for ( i = m_scrollPosY; i < m_numRows; i++ ) - { - if ( rowTop > ch ) break; + // Make the edit control large enough to allow for internal margins + // TODO: remove this if the text ctrl sizing is improved esp. for unix + // + int extra; +#if defined(__WXMOTIF__) + if ( m_currentCellCoords.GetRow() == 0 || + m_currentCellCoords.GetCol() == 0 ) + { + extra = 2; + } + else + { + extra = 4; + } +#else + if ( m_currentCellCoords.GetRow() == 0 || + m_currentCellCoords.GetCol() == 0 ) + { + extra = 1; + } + else + { + extra = 2; + } +#endif - dc.DrawLine( m_left + 1, rowTop + 1, - m_left + m_rowLabelWidth, rowTop + 1 ); +#if defined(__WXGTK__) + int top_diff = 0; + int left_diff = 0; + if (left != 0) left_diff++; + if (top != 0) top_diff++; + rect.SetLeft( left + left_diff ); + rect.SetTop( top + top_diff ); + rect.SetRight( rect.GetRight() - left_diff ); + rect.SetBottom( rect.GetBottom() - top_diff ); +#else + rect.SetLeft( wxMax(0, left - extra) ); + rect.SetTop( wxMax(0, top - extra) ); + rect.SetRight( rect.GetRight() + 2*extra ); + rect.SetBottom( rect.GetBottom() + 2*extra ); +#endif - dc.DrawLine( m_left + 1, rowTop + 1, - m_left + 1, rowTop + m_rowHeights[i] ); + m_cellEditCtrl->SetSize( rect ); + m_cellEditCtrl->Show( TRUE ); - rowTop += m_rowHeights[i]; - } -} + switch ( m_editCtrlType ) + { + case wxGRID_TEXTCTRL: + ((wxTextCtrl *) m_cellEditCtrl)->SetInsertionPointEnd(); + break; + case wxGRID_CHECKBOX: + // TODO: anything ??? + // + break; -void wxGrid::DrawRowLabel( wxDC& dc, const wxRect& rect, int row ) -{ - wxRect rect2; - rect2 = rect; - rect2.x += 3; - rect2.y += 2; - rect2.width -= 5; - rect2.height -= 4; + case wxGRID_CHOICE: + // TODO: anything ??? + // + break; - dc.SetBackgroundMode( wxTRANSPARENT ); - dc.SetTextBackground( GetLabelBackgroundColour() ); - dc.SetTextForeground( GetLabelTextColour() ); - dc.SetFont( GetLabelFont() ); + case wxGRID_COMBOBOX: + // TODO: anything ??? + // + break; + } - int hAlign, vAlign; - GetRowLabelAlignment( &hAlign, &vAlign ); - DrawTextRectangle( dc, GetRowLabelValue( row ), rect2, hAlign, vAlign ); + m_cellEditCtrl->SetFocus(); + } + } } -void wxGrid::DrawCellArea( wxDC& dc ) +void wxGrid::HideCellEditControl() { - int cw, ch; - GetClientSize(&cw, &ch); - - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) ); - - int left = m_left + m_rowLabelWidth + 1; - int top = m_top + m_colLabelHeight + 1; - - dc.DrawRectangle( left, top, cw - left, ch - top ); + if ( IsCellEditControlEnabled() ) + { + m_cellEditCtrl->Show( FALSE ); + } } -void wxGrid::DrawGridLines( wxDC& dc ) +void wxGrid::SetEditControlValue( const wxString& value ) { - if ( !m_gridLinesEnabled || !m_numRows || !m_numCols ) return; - - int i; - int cw, ch; - GetClientSize(&cw, &ch); - - dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); - - // horizontal grid lines - // - int rowTop = m_top + m_colLabelHeight + m_rowHeights[m_scrollPosY]; - for ( i = m_scrollPosY + 1; i <= m_numRows; i++ ) + if ( m_table ) { - if ( rowTop > ch ) break; - - dc.DrawLine( m_left + m_rowLabelWidth + 1, rowTop, - m_right, rowTop); - - if ( i < m_numRows ) rowTop += m_rowHeights[i]; - } + wxString s; + if ( !value ) + s = GetCellValue(m_currentCellCoords); + else + s = value; + if ( IsCellEditControlEnabled() ) + { + switch ( m_editCtrlType ) + { + case wxGRID_TEXTCTRL: + ((wxGridTextCtrl *)m_cellEditCtrl)->SetStartValue(s); + break; - // vertical grid lines - // - int colLeft = m_left + m_rowLabelWidth + m_colWidths[m_scrollPosX]; - for ( i = m_scrollPosX + 1; i <= m_numCols; i++ ) - { - if ( colLeft > cw ) break; + case wxGRID_CHECKBOX: + // TODO: implement this + // + break; - dc.DrawLine( colLeft, m_top + m_colLabelHeight + 1, - colLeft, m_bottom ); + case wxGRID_CHOICE: + // TODO: implement this + // + break; - if ( i < m_numCols ) colLeft += m_colWidths[i]; + case wxGRID_COMBOBOX: + // TODO: implement this + // + break; + } + } } } -void wxGrid::DrawCells( wxDC& dc ) +void wxGrid::SaveEditControlValue() { - if ( !m_numRows || !m_numCols ) return; - - int row, col; + if ( m_table ) + { + wxWindow *ctrl = (wxWindow *)NULL; - int cw, ch; - GetClientSize( &cw, &ch ); + if ( IsCellEditControlEnabled() ) + { + ctrl = m_cellEditCtrl; + } + else + { + return; + } - wxRect rect; + bool valueChanged = FALSE; - if ( m_table ) - { - rect.y = m_top + m_colLabelHeight; - for ( row = m_scrollPosY; row < m_numRows; row++ ) + switch ( m_editCtrlType ) { - if ( rect.y > ch ) break; + case wxGRID_TEXTCTRL: + valueChanged = (((wxGridTextCtrl *)ctrl)->GetValue() != + ((wxGridTextCtrl *)ctrl)->GetStartValue()); + SetCellValue( m_currentCellCoords, + ((wxTextCtrl *) ctrl)->GetValue() ); + break; - rect.height = m_rowHeights[ row ]; - rect.x = m_left + m_rowLabelWidth; + case wxGRID_CHECKBOX: + // TODO: implement this + // + break; - for ( col = m_scrollPosX; col < m_numCols; col++ ) - { - if ( rect.x > cw ) break; + case wxGRID_CHOICE: + // TODO: implement this + // + break; - rect.width = m_colWidths[col]; - DrawCellBackground( dc, rect, row, col ); - DrawCellValue( dc, rect, row, col ); - rect.x += rect.width; - } - rect.y += rect.height; + case wxGRID_COMBOBOX: + // TODO: implement this + // + break; } - } -} - - -void wxGrid::DrawCellBackground( wxDC& dc, const wxRect& rect, int row, int col ) -{ - wxRect rect2; - rect2 = rect; - rect2.x += 1; - rect2.y += 1; - rect2.width -= 2; - rect2.height -= 2; - dc.SetBackgroundMode( wxSOLID ); - - if ( IsInSelection( row, col ) ) - { - // TODO: improve this - // - dc.SetBrush( *wxBLACK_BRUSH ); - } - else - { - dc.SetBrush( wxBrush(GetCellBackgroundColour(row, col), wxSOLID) ); + if ( valueChanged ) + { + SendEvent( EVT_GRID_CELL_CHANGE, + m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() ); + } } - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( rect2 ); } -// This draws a text value in the given cell. If useValueArg is FALSE -// (the default) then the grid table value will be used // -void wxGrid::DrawCellValue( wxDC& dc, const wxRect& rect, int row, int col, - const wxString& value, bool useValueArg ) -{ - wxRect rect2; - rect2 = rect; - rect2.x += 3; - rect2.y += 2; - rect2.width -= 5; - rect2.height -= 4; - - dc.SetBackgroundMode( wxTRANSPARENT ); - - if ( IsInSelection( row, col ) ) - { - // TODO: improve this - // - dc.SetTextBackground( wxColour(0, 0, 0) ); - dc.SetTextForeground( wxColour(255, 255, 255) ); - } - else - { - dc.SetTextBackground( GetCellBackgroundColour(row, col) ); - dc.SetTextForeground( GetCellTextColour(row, col) ); - } - dc.SetFont( GetCellFont(row, col) ); +// ------ Grid location functions +// Note that all of these functions work with the logical coordinates of +// grid cells and labels so you will need to convert from device +// coordinates for mouse events etc. +// - int hAlign, vAlign; - GetCellAlignment( row, col, &hAlign, &vAlign ); +void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) +{ + int row = YToRow(y); + int col = XToCol(x); - if ( useValueArg ) + if ( row == -1 || col == -1 ) { - DrawTextRectangle( dc, value, rect2, hAlign, vAlign ); + coords = wxGridNoCellCoords; } else { - DrawTextRectangle( dc, GetCellValue( row, col ), rect2, hAlign, vAlign ); + coords.Set( row, col ); } } -// this is used to echo text being entered into the top edit control when -// in-place editing is turned off -// -void wxGrid::DrawCellValue( const wxGridCellCoords& coords, const wxString& value ) +int wxGrid::YToRow( int y ) { - if ( IsVisible( coords ) ) - { - int row = coords.GetRow(); - int col = coords.GetCol(); - wxRect rect; - 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 ]; + int i; - wxClientDC dc( this ); - DrawCellBackground( dc, rect, row, col ); - DrawCellValue( dc, rect, row, col, value, TRUE ); + for ( i = 0; i < m_numRows; i++ ) + { + if ( y < m_rowBottoms[i] ) return i; } + + return -1; } -void wxGrid::DrawCellHighlight( wxDC& dc, int row, int col ) +int wxGrid::XToCol( int x ) { - // TODO: bounds checking on row, col ? - // + int i; - if ( row >= m_scrollPosY && col >= m_scrollPosX ) + for ( i = 0; i < m_numCols; i++ ) { - long x, y; - - int cw, ch; - GetClientSize( &cw, &ch ); - - x = m_colRights[col] - m_colWidths[col]; - if ( x >= cw ) return; - - y = m_rowBottoms[row] - m_rowHeights[row]; - if ( y >= ch ) return; - - dc.SetLogicalFunction( wxINVERT ); - dc.SetPen( wxPen(GetCellHighlightColour(), 2, wxSOLID) ); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - - dc.DrawRectangle( x-2, y-2, - m_colWidths[col] + 6, - m_rowHeights[row] + 6 ); - - dc.SetLogicalFunction( wxCOPY ); + if ( x < m_colRights[i] ) return i; } + + return -1; } -// This function is handy when you just want to update one or a few -// cells. For example, it is used by SetCellValue() +// return the row number that that the y coord is near the edge of, or +// -1 if not near an edge // -void wxGrid::DrawCell( int row, int col ) +int wxGrid::YToEdgeOfRow( int y ) { - if ( !GetBatchCount() ) - { - if ( !IsVisible( wxGridCellCoords(row, col) ) ) return; - - int cw, ch; - GetClientSize( &cw, &ch ); - - wxRect rect( CellToRect( row, col ) ); + int i, d; - if ( m_table ) + for ( i = 0; i < m_numRows; i++ ) + { + if ( m_rowHeights[i] > WXGRID_LABEL_EDGE_ZONE ) { - wxClientDC dc( this ); - DrawCellBackground( dc, rect, row, col ); - DrawCellValue( dc, rect, row, col ); + d = abs( y - m_rowBottoms[i] ); + { + if ( d < WXGRID_LABEL_EDGE_ZONE ) return i; + } } } + + return -1; } -// this is just to make other code more obvious +// return the col number that that the x coord is near the edge of, or +// -1 if not near an edge // -void wxGrid::HideCurrentCellHighlight( wxDC& dc ) +int wxGrid::XToEdgeOfCol( int x ) { - if ( m_currentCellHighlighted && - m_currentCellCoords != wxGridNoCellCoords ) + int i, d; + + for ( i = 0; i < m_numCols; i++ ) { - DrawCellHighlight( dc, m_currentCellCoords ); - m_currentCellHighlighted = FALSE; + if ( m_colWidths[i] > WXGRID_LABEL_EDGE_ZONE ) + { + d = abs( x - m_colRights[i] ); + { + if ( d < WXGRID_LABEL_EDGE_ZONE ) return i; + } + } } + + return -1; } -// this is just to make other code more obvious -// -void wxGrid::ShowCurrentCellHighlight( wxDC& dc ) +wxRect wxGrid::CellToRect( int row, int col ) { - if ( !m_currentCellHighlighted && - m_currentCellCoords != wxGridNoCellCoords ) + wxRect rect( -1, -1, -1, -1 ); + + if ( row >= 0 && row < m_numRows && + col >= 0 && col < m_numCols ) { - DrawCellHighlight( dc, m_currentCellCoords ); - m_currentCellHighlighted = TRUE; + 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 ]; } + + return rect; } -void wxGrid::DrawTextRectangle( wxDC& dc, - const wxString& value, - const wxRect& rect, - int horizAlign, - int vertAlign ) +bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) { - long textWidth, textHeight; - long lineWidth, lineHeight; - wxArrayString lines; + // get the cell rectangle in logical coords + // + wxRect r( CellToRect( row, col ) ); - // see if we are already clipping + // convert to device coords // - wxRect clipRect; - dc.GetClippingBox( clipRect ); + int left, top, right, bottom; + CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top ); + CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom ); - bool alreadyClipping = TRUE; - wxRect intersectRect; + // check against the client area of the grid window + // + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); - if ( clipRect.x == 0 && clipRect.y == 0 && - clipRect.width == 0 && clipRect.height == 0) + if ( wholeCellVisible ) { - alreadyClipping = FALSE; - intersectRect = rect; + // is the cell wholly visible ? + // + return ( left >= 0 && right <= cw && + top >= 0 && bottom <= ch ); } else { - // Find the intersection of the clipping rectangle and our - // rectangle + // is the cell partly visible ? // - wxRegion region( rect ); - region.Intersect( clipRect ); - if ( region.IsEmpty() ) - { - // nothing to do - // - return; - } - intersectRect = region.GetBox(); + return ( ((left >=0 && left < cw) || (right > 0 && right <= cw)) && + ((top >=0 && top < ch) || (bottom > 0 && bottom <= ch)) ); } +} - if ( alreadyClipping ) dc.DestroyClippingRegion(); - dc.SetClippingRegion( intersectRect ); +// make the specified cell location visible by doing a minimal amount +// of scrolling +// +void wxGrid::MakeCellVisible( int row, int col ) +{ + int i; + int xpos = -1, ypos = -1; - StringToLines( value, lines ); - if ( lines.GetCount() ) + if ( row >= 0 && row < m_numRows && + col >= 0 && col < m_numCols ) { - GetTextBoxSize( dc, lines, &textWidth, &textHeight ); - dc.GetTextExtent( lines[0], &lineWidth, &lineHeight ); - - float x, y; - switch ( horizAlign ) - { - case wxRIGHT: - x = rect.x + (rect.width - textWidth - 1); - break; + // get the cell rectangle in logical coords + // + wxRect r( CellToRect( row, col ) ); - case wxCENTRE: - x = rect.x + ((rect.width - textWidth)/2); - break; + // convert to device coords + // + int left, top, right, bottom; + CalcScrolledPosition( r.GetLeft(), r.GetTop(), &left, &top ); + CalcScrolledPosition( r.GetRight(), r.GetBottom(), &right, &bottom ); - case wxLEFT: - default: - x = rect.x + 1; - break; - } + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); - switch ( vertAlign ) + if ( top < 0 ) { - case wxBOTTOM: - y = rect.y + (rect.height - textHeight - 1); - break; - - case wxCENTRE: - y = rect.y + ((rect.height - textHeight)/2); - break; - - case wxTOP: - default: - y = rect.y + 1; - break; + ypos = r.GetTop(); } - - for ( size_t i = 0; i < lines.GetCount(); i++ ) + else if ( bottom > ch ) { - dc.DrawText( lines[i], (long)x, (long)y ); - y += lineHeight; - } - } - - dc.DestroyClippingRegion(); - if (alreadyClipping) dc.SetClippingRegion( clipRect ); -} + int h = r.GetHeight(); + ypos = r.GetTop(); + for ( i = row-1; i >= 0; i-- ) + { + if ( h + m_rowHeights[i] > ch ) break; + h += m_rowHeights[i]; + ypos -= m_rowHeights[i]; + } -// Split multi line text up into an array of strings. Any existing -// contents of the string array are preserved. -// -void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) -{ - // TODO: this won't work for WXMAC ? (lines end with '\r') - // => use wxTextFile functions then (VZ) - int startPos = 0; - int pos; - while ( startPos < (int)value.Length() ) - { - pos = value.Mid(startPos).Find( '\n' ); - if ( pos < 0 ) - { - break; + // we divide it later by GRID_SCROLL_LINE, make sure that we don't + // have rounding errors (this is important, because if we do, we + // might not scroll at all and some cells won't be redrawn) + ypos += GRID_SCROLL_LINE / 2; } - else if ( pos == 0 ) + + if ( left < 0 ) { - lines.Add( wxEmptyString ); + xpos = r.GetLeft(); } - else + else if ( right > cw ) { - if ( value[startPos+pos-1] == '\r' ) - { - lines.Add( value.Mid(startPos, pos-1) ); - } - else + int w = r.GetWidth(); + xpos = r.GetLeft(); + for ( i = col-1; i >= 0; i-- ) { - lines.Add( value.Mid(startPos, pos) ); - } - } - startPos += pos+1; - } - if ( startPos < (int)value.Length() ) - { - lines.Add( value.Mid( startPos ) ); - } -} + if ( w + m_colWidths[i] > cw ) break; + w += m_colWidths[i]; + xpos -= m_colWidths[i]; + } -void wxGrid::GetTextBoxSize( wxDC& dc, - wxArrayString& lines, - long *width, long *height ) -{ - long w = 0; - long h = 0; - long lineW, lineH; + // see comment for ypos above + xpos += GRID_SCROLL_LINE / 2; + } - size_t i; - for ( i = 0; i < lines.GetCount(); i++ ) - { - dc.GetTextExtent( lines[i], &lineW, &lineH ); - w = wxMax( w, lineW ); - h += lineH; + if ( xpos != -1 || ypos != -1 ) + { + if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE; + if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE; + Scroll( xpos, ypos ); + AdjustScrollbars(); + } } - - *width = w; - *height = h; } // -// ------ functions to get/send data (see also public functions) +// ------ Grid cursor movement functions // -bool wxGrid::GetModelValues() +bool wxGrid::MoveCursorUp() { - if ( m_table ) + if ( m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetRow() > 0 ) { - // all we need to do is repaint the grid - // - Refresh(); + MakeCellVisible( m_currentCellCoords.GetRow() - 1, + m_currentCellCoords.GetCol() ); + + SetCurrentCell( m_currentCellCoords.GetRow() - 1, + m_currentCellCoords.GetCol() ); + return TRUE; } @@ -3385,19 +3500,18 @@ bool wxGrid::GetModelValues() } -bool wxGrid::SetModelValues() +bool wxGrid::MoveCursorDown() { - int row, col; - - if ( m_table ) + // TODO: allow for scrolling + // + if ( m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetRow() < m_numRows-1 ) { - for ( row = m_scrollPosY; row < m_numRows; row++ ) - { - for ( col = m_scrollPosX; col < m_numCols; col++ ) - { - m_table->SetValue( row, col, GetCellValue(row, col) ); - } - } + MakeCellVisible( m_currentCellCoords.GetRow() + 1, + m_currentCellCoords.GetCol() ); + + SetCurrentCell( m_currentCellCoords.GetRow() + 1, + m_currentCellCoords.GetCol() ); return TRUE; } @@ -3406,317 +3520,326 @@ bool wxGrid::SetModelValues() } -// -// ------ public functions -// - -bool wxGrid::CreateGrid( int numRows, int numCols ) +bool wxGrid::MoveCursorLeft() { - if ( m_created ) - { - wxLogError( wxT("wxGrid::CreateGrid(numRows, numCols) called more than once") ); - return FALSE; - } - else + if ( m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetCol() > 0 ) { - m_numRows = numRows; - m_numCols = numCols; + MakeCellVisible( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() - 1 ); - m_table = new wxGridStringTable( m_numRows, m_numCols ); - m_table->SetView( this ); - Init(); - m_created = TRUE; + SetCurrentCell( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() - 1 ); + + return TRUE; } - return m_created; + return FALSE; } -// The behaviour of this function depends on the grid table class -// Clear() function. For the default wxGridStringTable class the -// behavious is to replace all cell contents with wxEmptyString but -// not to change the number of rows or cols. -// -void wxGrid::ClearGrid() +bool wxGrid::MoveCursorRight() { - if ( m_table ) + if ( m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetCol() < m_numCols - 1 ) { - m_table->Clear(); - SetEditControlValue(); - if ( !GetBatchCount() ) Refresh(); - } -} + MakeCellVisible( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() + 1 ); + SetCurrentCell( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() + 1 ); -bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) -{ - // TODO: something with updateLabels flag - - if ( !m_created ) - { - wxLogError( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); - return FALSE; + return TRUE; } - if ( m_table ) - { - bool ok = m_table->InsertRows( pos, numRows ); - - // the table will have sent the results of the insert row - // operation to this view object as a grid table message - // - if ( ok ) - { - if ( m_numCols == 0 ) - { - m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS ); - // - // TODO: perhaps instead of appending the default number of cols - // we should remember what the last non-zero number of cols was ? - // - } - - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SelectCell( 0, 0 ); - } - - if ( !GetBatchCount() ) Refresh(); - } - - SetEditControlValue(); - return ok; - } - else - { - return FALSE; - } + return FALSE; } -bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) + +bool wxGrid::MovePageUp() { - // TODO: something with updateLabels flag + if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE; - if ( !m_created ) + int row = m_currentCellCoords.GetRow(); + if ( row > 0 ) { - wxLogError( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); - return FALSE; - } + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); - if ( m_table && m_table->AppendRows( numRows ) ) - { - if ( m_currentCellCoords == wxGridNoCellCoords ) + int y = m_rowBottoms[ row ] - m_rowHeights[ row ]; + int newRow = YToRow( y - ch + 1 ); + if ( newRow == -1 ) { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SelectCell( 0, 0 ); + newRow = 0; + } + else if ( newRow == row ) + { + newRow = row - 1; } - // the table will have sent the results of the append row - // operation to this view object as a grid table message - // - if ( !GetBatchCount() ) Refresh(); + MakeCellVisible( newRow, m_currentCellCoords.GetCol() ); + SetCurrentCell( newRow, m_currentCellCoords.GetCol() ); + return TRUE; } - else - { - return FALSE; - } + + return FALSE; } -bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) +bool wxGrid::MovePageDown() { - // TODO: something with updateLabels flag + if ( m_currentCellCoords == wxGridNoCellCoords ) return FALSE; - if ( !m_created ) + int row = m_currentCellCoords.GetRow(); + if ( row < m_numRows ) { - wxLogError( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") ); - return FALSE; - } + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); - if ( m_table && m_table->DeleteRows( pos, numRows ) ) - { - // the table will have sent the results of the delete row - // operation to this view object as a grid table message - // - if ( m_numRows > 0 ) - SetEditControlValue(); - else - HideCellEditControl(); + int y = m_rowBottoms[ row ] - m_rowHeights[ row ]; + int newRow = YToRow( y + ch ); + if ( newRow == -1 ) + { + newRow = m_numRows - 1; + } + else if ( newRow == row ) + { + newRow = row + 1; + } + + MakeCellVisible( newRow, m_currentCellCoords.GetCol() ); + SetCurrentCell( newRow, m_currentCellCoords.GetCol() ); - if ( !GetBatchCount() ) Refresh(); return TRUE; } - else - { - return FALSE; - } + + return FALSE; } -bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) +bool wxGrid::MoveCursorUpBlock() { - // TODO: something with updateLabels flag - - if ( !m_created ) - { - wxLogError( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") ); - return FALSE; - } - - if ( m_table ) + if ( m_table && + m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetRow() > 0 ) { - HideCellEditControl(); - bool ok = m_table->InsertCols( pos, numCols ); + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - // the table will have sent the results of the insert col - // operation to this view object as a grid table message - // - if ( ok ) + if ( m_table->IsEmptyCell(row, col) ) { - if ( m_currentCellCoords == wxGridNoCellCoords ) + // starting in an empty cell: find the next block of + // non-empty cells + // + while ( row > 0 ) { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SelectCell( 0, 0 ); + row-- ; + if ( !(m_table->IsEmptyCell(row, col)) ) break; } - - if ( !GetBatchCount() ) Refresh(); } - - SetEditControlValue(); - return ok; - } - else - { - return FALSE; - } -} - -bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) -{ - // TODO: something with updateLabels flag - - if ( !m_created ) - { - wxLogError( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") ); - return FALSE; - } - - if ( m_table && m_table->AppendCols( numCols ) ) - { - // the table will have sent the results of the append col - // operation to this view object as a grid table message - // - if ( m_currentCellCoords == wxGridNoCellCoords ) + else if ( m_table->IsEmptyCell(row-1, col) ) { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... + // starting at the top of a block: find the next block + // + row--; + while ( row > 0 ) + { + row-- ; + if ( !(m_table->IsEmptyCell(row, col)) ) break; + } + } + else + { + // starting within a block: find the top of the block // - SelectCell( 0, 0 ); + while ( row > 0 ) + { + row-- ; + if ( m_table->IsEmptyCell(row, col) ) + { + row++ ; + break; + } + } } - if ( !GetBatchCount() ) Refresh(); + + MakeCellVisible( row, col ); + SetCurrentCell( row, col ); + return TRUE; } - else - { - return FALSE; - } + + return FALSE; } -bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) +bool wxGrid::MoveCursorDownBlock() { - // TODO: something with updateLabels flag - - if ( !m_created ) + if ( m_table && + m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetRow() < m_numRows-1 ) { - wxLogError( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") ); - return FALSE; - } + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - if ( m_table && m_table->DeleteCols( pos, numCols ) ) - { - // the table will have sent the results of the delete col - // operation to this view object as a grid table message - // - if ( m_numCols > 0 ) - SetEditControlValue(); + if ( m_table->IsEmptyCell(row, col) ) + { + // starting in an empty cell: find the next block of + // non-empty cells + // + while ( row < m_numRows-1 ) + { + row++ ; + if ( !(m_table->IsEmptyCell(row, col)) ) break; + } + } + else if ( m_table->IsEmptyCell(row+1, col) ) + { + // starting at the bottom of a block: find the next block + // + row++; + while ( row < m_numRows-1 ) + { + row++ ; + if ( !(m_table->IsEmptyCell(row, col)) ) break; + } + } else - HideCellEditControl(); + { + // starting within a block: find the bottom of the block + // + while ( row < m_numRows-1 ) + { + row++ ; + if ( m_table->IsEmptyCell(row, col) ) + { + row-- ; + break; + } + } + } + + MakeCellVisible( row, col ); + SetCurrentCell( row, col ); - if ( !GetBatchCount() ) Refresh(); return TRUE; } - else - { - return FALSE; - } -} - - - -// ------ control panel and cell edit control -// - -void wxGrid::EnableEditing( bool edit ) -{ - // TODO: improve this ? - // - if ( edit != m_editable ) - { - m_editable = edit; - if ( !m_editable ) HideCellEditControl(); - m_topEditCtrlEnabled = m_editable; - m_cellEditCtrlEnabled = m_editable; - if ( !m_editable ) ShowCellEditControl(); - } + return FALSE; } - -void wxGrid::EnableTopEditControl( bool enable ) +bool wxGrid::MoveCursorLeftBlock() { - if ( enable != m_topEditCtrlEnabled ) + if ( m_table && + m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetCol() > 0 ) { - HideCellEditControl(); - m_topEditCtrlEnabled = enable; - CalcDimensions(); - m_topEditCtrl->Show( enable ); + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + + if ( m_table->IsEmptyCell(row, col) ) + { + // starting in an empty cell: find the next block of + // non-empty cells + // + while ( col > 0 ) + { + col-- ; + if ( !(m_table->IsEmptyCell(row, col)) ) break; + } + } + else if ( m_table->IsEmptyCell(row, col-1) ) + { + // starting at the left of a block: find the next block + // + col--; + while ( col > 0 ) + { + col-- ; + if ( !(m_table->IsEmptyCell(row, col)) ) break; + } + } + else + { + // starting within a block: find the left of the block + // + while ( col > 0 ) + { + col-- ; + if ( m_table->IsEmptyCell(row, col) ) + { + col++ ; + break; + } + } + } - if ( m_currentCellCoords != wxGridNoCellCoords ) - SetEditControlValue(); + MakeCellVisible( row, col ); + SetCurrentCell( row, col ); - ShowCellEditControl(); - if ( !GetBatchCount() ) Refresh(); + return TRUE; } + + return FALSE; } -void wxGrid::EnableCellEditControl( bool enable ) +bool wxGrid::MoveCursorRightBlock() { - if ( m_cellEditCtrl && - enable != m_cellEditCtrlEnabled ) + if ( m_table && + m_currentCellCoords != wxGridNoCellCoords && + m_currentCellCoords.GetCol() < m_numCols-1 ) { - wxClientDC dc( this ); + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - HideCurrentCellHighlight( dc ); - HideCellEditControl(); - SaveEditControlValue(); + if ( m_table->IsEmptyCell(row, col) ) + { + // starting in an empty cell: find the next block of + // non-empty cells + // + while ( col < m_numCols-1 ) + { + col++ ; + if ( !(m_table->IsEmptyCell(row, col)) ) break; + } + } + else if ( m_table->IsEmptyCell(row, col+1) ) + { + // starting at the right of a block: find the next block + // + col++; + while ( col < m_numCols-1 ) + { + col++ ; + if ( !(m_table->IsEmptyCell(row, col)) ) break; + } + } + else + { + // starting within a block: find the right of the block + // + while ( col < m_numCols-1 ) + { + col++ ; + if ( m_table->IsEmptyCell(row, col) ) + { + col-- ; + break; + } + } + } - m_cellEditCtrlEnabled = enable; + MakeCellVisible( row, col ); + SetCurrentCell( row, col ); - SetEditControlValue(); - ShowCellEditControl(); - ShowCurrentCellHighlight( dc ); + return TRUE; } + + return FALSE; } + // -// ------ grid formatting functions +// ------ Label values and formatting // void wxGrid::GetRowLabelAlignment( int *horiz, int *vert ) @@ -3759,38 +3882,196 @@ wxString wxGrid::GetColLabelValue( int col ) } } -void wxGrid::SetRowLabelSize( int width ) -{ - m_rowLabelWidth = wxMax( 0, width ); - CalcDimensions(); - ShowCellEditControl(); - if ( !GetBatchCount() ) Refresh(); -} - -void wxGrid::SetColLabelSize( int height ) -{ - m_colLabelHeight = wxMax( 0, height ); - CalcDimensions(); - ShowCellEditControl(); - if ( !GetBatchCount() ) Refresh(); -} + +void wxGrid::SetRowLabelSize( int width ) +{ + 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 ) +{ + 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 ) { - m_labelBackgroundColour = colour; - if ( !GetBatchCount() ) Refresh(); + if ( m_labelBackgroundColour != colour ) + { + m_labelBackgroundColour = colour; + m_rowLabelWin->SetBackgroundColour( colour ); + m_colLabelWin->SetBackgroundColour( colour ); + m_cornerLabelWin->SetBackgroundColour( colour ); + + if ( !GetBatchCount() ) + { + m_rowLabelWin->Refresh(); + m_colLabelWin->Refresh(); + m_cornerLabelWin->Refresh(); + } + } } void wxGrid::SetLabelTextColour( const wxColour& colour ) { - m_labelTextColour = colour; - if ( !GetBatchCount() ) Refresh(); + if ( m_labelTextColour != colour ) + { + m_labelTextColour = colour; + if ( !GetBatchCount() ) + { + m_rowLabelWin->Refresh(); + m_colLabelWin->Refresh(); + } + } } void wxGrid::SetLabelFont( const wxFont& font ) { m_labelFont = font; - if ( !GetBatchCount() ) Refresh(); + if ( !GetBatchCount() ) + { + m_rowLabelWin->Refresh(); + m_colLabelWin->Refresh(); + } } void wxGrid::SetRowLabelAlignment( int horiz, int vert ) @@ -3805,7 +4086,10 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert ) m_rowLabelVertAlign = vert; } - if ( !GetBatchCount() ) Refresh(); + if ( !GetBatchCount() ) + { + m_rowLabelWin->Refresh(); + } } void wxGrid::SetColLabelAlignment( int horiz, int vert ) @@ -3820,7 +4104,10 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert ) m_colLabelVertAlign = vert; } - if ( !GetBatchCount() ) Refresh(); + if ( !GetBatchCount() ) + { + m_colLabelWin->Refresh(); + } } void wxGrid::SetRowLabelValue( int row, const wxString& s ) @@ -3828,7 +4115,17 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s ) if ( m_table ) { m_table->SetRowLabelValue( row, s ); - if ( !GetBatchCount() ) Refresh(); + if ( !GetBatchCount() ) + { + 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 ); + } + } } } @@ -3837,16 +4134,30 @@ void wxGrid::SetColLabelValue( int col, const wxString& s ) if ( m_table ) { m_table->SetColLabelValue( col, s ); - if ( !GetBatchCount() ) Refresh(); + if ( !GetBatchCount() ) + { + 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 ); + } + } } } void wxGrid::SetGridLineColour( const wxColour& colour ) { - m_gridLineColour = colour; + if ( m_gridLineColour != colour ) + { + m_gridLineColour = colour; - wxClientDC dc( this ); - DrawGridLines( dc ); + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + DrawAllGridLines( dc, wxRegion() ); + } } void wxGrid::EnableGridLines( bool enable ) @@ -3854,7 +4165,20 @@ void wxGrid::EnableGridLines( bool enable ) if ( enable != m_gridLinesEnabled ) { m_gridLinesEnabled = enable; - if ( !GetBatchCount() ) Refresh(); + + if ( !GetBatchCount() ) + { + if ( enable ) + { + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + DrawAllGridLines( dc, wxRegion() ); + } + else + { + m_gridWin->Refresh(); + } + } } } @@ -3914,14 +4238,6 @@ wxColour wxGrid::GetCellTextColour( int WXUNUSED(row), int WXUNUSED(col) ) } -wxColour wxGrid::GetCellHighlightColour() -{ - // TODO: replace this temp test code - // - return wxColour( 0, 0, 0 ); -} - - wxFont wxGrid::GetDefaultCellFont() { return m_defaultCellFont; @@ -3956,29 +4272,33 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) if ( resizeExistingRows ) { - // TODO: what do we do about events here ? - // Generate an event for each resize ? - // int row; + int bottom = 0; for ( row = 0; row < m_numRows; row++ ) { m_rowHeights[row] = m_defaultRowHeight; + bottom += m_defaultRowHeight; + m_rowBottoms[row] = bottom; } - m_sumRowHeights = m_defaultRowHeight * m_numRows; CalcDimensions(); - if ( !GetBatchCount() ) Refresh(); } } void wxGrid::SetRowSize( int row, int height ) { + int i; + if ( row >= 0 && row < m_numRows ) { - m_sumRowHeights -= m_rowHeights[row]; - m_rowHeights[row] = wxMax( 0, height ); - m_sumRowHeights += m_rowHeights[row]; + int h = wxMax( 0, height ); + int diff = h - m_rowHeights[row]; + + m_rowHeights[row] = h; + for ( i = row; i < m_numRows; i++ ) + { + m_rowBottoms[i] += diff; + } CalcDimensions(); - if ( !GetBatchCount() ) Refresh(); // Note: we are ending the event *after* doing // default processing in this case @@ -3998,29 +4318,33 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) if ( resizeExistingCols ) { - // TODO: what do we do about events here ? - // Generate an event for each resize ? - // int col; + int right = 0; for ( col = 0; col < m_numCols; col++ ) { m_colWidths[col] = m_defaultColWidth; + right += m_defaultColWidth; + m_colRights[col] = right; } - m_sumColWidths = m_defaultColWidth * m_numCols; CalcDimensions(); - if ( !GetBatchCount() ) Refresh(); } } void wxGrid::SetColSize( int col, int width ) { + int i; + if ( col >= 0 && col < m_numCols ) { - m_sumColWidths -= m_colWidths[col]; - m_colWidths[col] = wxMax( 0, width ); - m_sumColWidths += m_colWidths[col]; + int w = wxMax( 0, width ); + int diff = w - m_colWidths[col]; + m_colWidths[col] = w; + + for ( i = col; i < m_numCols; i++ ) + { + m_colRights[i] += diff; + } CalcDimensions(); - if ( !GetBatchCount() ) Refresh(); // Note: we are ending the event *after* doing // default processing in this case @@ -4058,12 +4382,6 @@ void wxGrid::SetCellTextColour( int WXUNUSED(row), int WXUNUSED(col), const wxCo // } -void wxGrid::SetCellHighlightColour( const wxColour& ) -{ - // TODO: everything !!! - // -} - void wxGrid::SetDefaultCellFont( const wxFont& ) { // TODO: everything !!! @@ -4089,6 +4407,7 @@ void wxGrid::SetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int WXUNUSE } + // // ------ cell value accessor functions // @@ -4098,169 +4417,97 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s ) if ( m_table ) { m_table->SetValue( row, col, s.c_str() ); - DrawCell( row, col ); + if ( !GetBatchCount() ) + { + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + DrawCell( dc, wxGridCellCoords(row, col) ); + } + +#if 0 // TODO: edit in place + if ( m_currentCellCoords.GetRow() == row && m_currentCellCoords.GetCol() == col ) { SetEditControlValue( s ); } - } -} - - - -// -// ------ interaction with data model -// -bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg ) -{ - switch ( msg.GetId() ) - { - case wxGRIDTABLE_REQUEST_VIEW_GET_VALUES: - return GetModelValues(); - - case wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES: - return SetModelValues(); - - case wxGRIDTABLE_NOTIFY_ROWS_INSERTED: - case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: - case wxGRIDTABLE_NOTIFY_ROWS_DELETED: - case wxGRIDTABLE_NOTIFY_COLS_INSERTED: - case wxGRIDTABLE_NOTIFY_COLS_APPENDED: - case wxGRIDTABLE_NOTIFY_COLS_DELETED: - return Redimension( msg ); +#endif - default: - return FALSE; } } // -// ------ Grid location functions +// ------ Block, row and col selection // -// (see also inline functions in grid.h) - -// check to see if a cell location is wholly visible -// -bool wxGrid::IsVisible( const wxGridCellCoords& coords ) +void wxGrid::SelectRow( int row, bool addToSelected ) { - return ( coords.GetRow() >= m_scrollPosY && - coords.GetRow() < m_scrollPosY + m_wholeRowsVisible && - coords.GetCol() >= m_scrollPosX && - coords.GetCol() < m_scrollPosX + m_wholeColsVisible ); -} + wxRect r; + if ( IsSelection() && addToSelected ) + { + wxRect rect[4]; + bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE }; + int i; -// make the specified cell location visible by doing a minimal amount -// of scrolling -// -void wxGrid::MakeCellVisible( int row, int col ) -{ - int lastX = m_scrollPosX; - int lastY = m_scrollPosY; + wxCoord oldLeft = m_selectedTopLeft.GetCol(); + wxCoord oldTop = m_selectedTopLeft.GetRow(); + wxCoord oldRight = m_selectedBottomRight.GetCol(); + wxCoord oldBottom = m_selectedBottomRight.GetRow(); - if ( row >= 0 && row < m_numRows && - col >= 0 && col < m_numCols ) - { - if ( row < m_scrollPosY ) + if ( oldTop > row ) { - SetVerticalScrollPos( row ); - } - else if ( row >= m_scrollPosY + m_wholeRowsVisible ) - { - int i; - int h = m_rowBottoms[row]; - for ( i = m_scrollPosY; i < m_numRows && h > m_bottom; i++ ) - { - h -= m_rowHeights[i]; - } - SetVerticalScrollPos( i ); + need_refresh[0] = TRUE; + rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ), + wxGridCellCoords ( oldTop - 1, + m_numCols - 1 ) ); + m_selectedTopLeft.SetRow( row ); } - if ( col < m_scrollPosX ) + if ( oldLeft > 0 ) { - SetHorizontalScrollPos( col ); + need_refresh[1] = TRUE; + rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ), + wxGridCellCoords ( oldBottom, + oldLeft - 1 ) ); + + m_selectedTopLeft.SetCol( 0 ); } - else if ( col >= m_scrollPosX + m_wholeColsVisible ) + + if ( oldBottom < row ) { - int i; - int w = m_colRights[col]; - for ( i = m_scrollPosX; i < m_numCols && w > m_right; i++ ) - { - w -= m_colWidths[i]; - } - SetHorizontalScrollPos( i ); + need_refresh[2] = TRUE; + rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ), + wxGridCellCoords ( row, + m_numCols - 1 ) ); + m_selectedBottomRight.SetRow( row ); } - if ( m_scrollPosX != lastX || m_scrollPosY != lastY ) + if ( oldRight < m_numCols - 1 ) { - // The cell was not visible before but not it is - // - ShowCellEditControl(); + need_refresh[3] = TRUE; + rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop , + oldRight + 1 ), + wxGridCellCoords ( oldBottom, + m_numCols - 1 ) ); + m_selectedBottomRight.SetCol( m_numCols - 1 ); } - } - else - { - // TODO: log an error - } -} - - -void wxGrid::SetVerticalScrollPos( int topMostRow ) -{ - if ( m_vertScrollBar && topMostRow != m_scrollPosY ) - { - m_scrollPosY = topMostRow; - - CalcDimensions(); - Refresh(); - } -} - - -void wxGrid::SetHorizontalScrollPos( int leftMostCol ) -{ - if ( m_horizScrollBar && leftMostCol != m_scrollPosX ) - { - m_scrollPosX = leftMostCol; - - CalcDimensions(); - Refresh(); - } -} - - -// -// ------ block, row and col selection -// - -void wxGrid::SelectRow( int row, bool addToSelected ) -{ - if ( IsSelection() && addToSelected ) - { - if ( m_selectedTopLeft.GetRow() > row ) - m_selectedTopLeft.SetRow( row ); - - m_selectedTopLeft.SetCol( 0 ); - if ( m_selectedBottomRight.GetRow() < row ) - m_selectedBottomRight.SetRow( row ); - - m_selectedBottomRight.SetCol( m_numCols - 1 ); + for (i = 0; i < 4; i++ ) + if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) + m_gridWin->Refresh( FALSE, &(rect[i]) ); } else { + r = SelectionToDeviceRect(); ClearSelection(); + if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r ); + m_selectedTopLeft.Set( row, 0 ); m_selectedBottomRight.Set( row, m_numCols-1 ); - } - - if ( !GetBatchCount() ) - { - wxRect rect( SelectionToRect() ); - if ( rect != wxGridNoCellRect ) Refresh( TRUE, &rect ); + r = SelectionToDeviceRect(); + m_gridWin->Refresh( FALSE, &r ); } wxGridRangeSelectEvent gridEvt( GetId(), @@ -4275,29 +4522,70 @@ void wxGrid::SelectRow( int row, bool addToSelected ) void wxGrid::SelectCol( int col, bool addToSelected ) { - if ( addToSelected && m_selectedTopLeft != wxGridNoCellCoords ) + if ( IsSelection() && addToSelected ) { - if ( m_selectedTopLeft.GetCol() > col ) + wxRect rect[4]; + bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE }; + int i; + + wxCoord oldLeft = m_selectedTopLeft.GetCol(); + wxCoord oldTop = m_selectedTopLeft.GetRow(); + wxCoord oldRight = m_selectedBottomRight.GetCol(); + wxCoord oldBottom = m_selectedBottomRight.GetRow(); + + if ( oldLeft > col ) + { + need_refresh[0] = TRUE; + rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ), + wxGridCellCoords ( m_numRows - 1, + oldLeft - 1 ) ); m_selectedTopLeft.SetCol( col ); + } - m_selectedTopLeft.SetRow( 0 ); + if ( oldTop > 0 ) + { + need_refresh[1] = TRUE; + rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ), + wxGridCellCoords ( oldTop - 1, + oldRight ) ); + m_selectedTopLeft.SetRow( 0 ); + } - if ( m_selectedBottomRight.GetCol() < col ) + if ( oldRight < col ) + { + need_refresh[2] = TRUE; + rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ), + wxGridCellCoords ( m_numRows - 1, + col ) ); m_selectedBottomRight.SetCol( col ); + } - m_selectedBottomRight.SetRow( m_numRows - 1 ); + if ( oldBottom < m_numRows - 1 ) + { + need_refresh[3] = TRUE; + rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, + oldLeft ), + wxGridCellCoords ( m_numRows - 1, + oldRight ) ); + m_selectedBottomRight.SetRow( m_numRows - 1 ); + } + + for (i = 0; i < 4; i++ ) + if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) + m_gridWin->Refresh( FALSE, &(rect[i]) ); } else { + wxRect r; + + r = SelectionToDeviceRect(); ClearSelection(); + if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r ); + m_selectedTopLeft.Set( 0, col ); m_selectedBottomRight.Set( m_numRows-1, col ); - } - - if ( !GetBatchCount() ) - { - wxRect rect( SelectionToRect() ); - if ( rect != wxGridNoCellRect ) Refresh( TRUE, &rect ); + r = SelectionToDeviceRect(); + m_gridWin->Refresh( FALSE, &r ); } wxGridRangeSelectEvent gridEvt( GetId(), @@ -4313,6 +4601,7 @@ void wxGrid::SelectCol( int col, bool addToSelected ) void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) { int temp; + wxGridCellCoords updateTopLeft, updateBottomRight; if ( topRow > bottomRow ) { @@ -4328,18 +4617,105 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) rightCol = temp; } - m_selectedTopLeft.Set( topRow, leftCol ); - m_selectedBottomRight.Set( bottomRow, rightCol ); + updateTopLeft = wxGridCellCoords( topRow, leftCol ); + updateBottomRight = wxGridCellCoords( bottomRow, rightCol ); - if ( !GetBatchCount() ) + if ( m_selectedTopLeft != updateTopLeft || + m_selectedBottomRight != updateBottomRight ) { - wxRect rect( SelectionToRect() ); - if ( rect != wxGridNoCellRect ) Refresh( TRUE, &rect ); + // Compute two optimal update rectangles: + // 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 }; + int i; + + // Store intermediate values + wxCoord oldLeft = m_selectedTopLeft.GetCol(); + wxCoord oldTop = m_selectedTopLeft.GetRow(); + wxCoord oldRight = m_selectedBottomRight.GetCol(); + wxCoord oldBottom = m_selectedBottomRight.GetRow(); + + // Determine the outer/inner coordinates. + if (oldLeft > leftCol) + { + temp = oldLeft; + oldLeft = leftCol; + leftCol = temp; + } + if (oldTop > topRow ) + { + temp = oldTop; + oldTop = topRow; + topRow = temp; + } + if (oldRight < rightCol ) + { + temp = oldRight; + oldRight = rightCol; + rightCol = temp; + } + 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 ) ); + } + + + // Change Selection + m_selectedTopLeft = updateTopLeft; + m_selectedBottomRight = updateBottomRight; + + // various Refresh() calls + for (i = 0; i < 4; i++ ) + if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) + m_gridWin->Refresh( FALSE, &(rect[i]) ); } // only generate an event if the block is not being selected by // dragging the mouse (in which case the event will be generated in - // OnMouse) } + // the mouse event handler) if ( !m_isDragging ) { wxGridRangeSelectEvent gridEvt( GetId(), @@ -4357,60 +4733,65 @@ void wxGrid::SelectAll() m_selectedTopLeft.Set( 0, 0 ); m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 ); - if ( !GetBatchCount() ) Refresh(); + m_gridWin->Refresh(); } void wxGrid::ClearSelection() { - if ( IsSelection() ) - { - wxRect rect( SelectionToRect() ); - if ( rect != wxGridNoCellRect ) - { - Refresh( TRUE, &rect ); - } - - m_selectedTopLeft = wxGridNoCellCoords; - m_selectedBottomRight = wxGridNoCellCoords; - } + m_selectedTopLeft = wxGridNoCellCoords; + m_selectedBottomRight = wxGridNoCellCoords; } -wxRect wxGrid::SelectionToRect() +// This function returns the rectangle that encloses the given block +// in device coords clipped to the client size of the grid window. +// +wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, + const wxGridCellCoords &bottomRight ) { - wxRect rect; + wxRect rect( wxGridNoCellRect ); wxRect cellRect; - if ( IsSelection() ) + cellRect = CellToRect( topLeft ); + if ( cellRect != wxGridNoCellRect ) { - cellRect = CellToRect( m_selectedTopLeft ); - if ( cellRect != wxGridNoCellRect ) - { - rect = cellRect; - } - else - { - rect = wxRect( m_left, m_top, 0, 0 ); - } + rect = cellRect; + } + else + { + rect = wxRect( 0, 0, 0, 0 ); + } - cellRect = CellToRect( m_selectedBottomRight ); - if ( cellRect != wxGridNoCellRect ) - { - rect += cellRect; - } - else - { - return wxGridNoCellRect; - } + cellRect = CellToRect( bottomRight ); + if ( cellRect != wxGridNoCellRect ) + { + rect += cellRect; + } + else + { + return wxGridNoCellRect; } + // convert to scrolled coords + // + int left, top, right, bottom; + CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top ); + CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom ); + + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); + + rect.SetLeft( wxMax(0, left) ); + rect.SetTop( wxMax(0, top) ); + rect.SetRight( wxMin(cw, right) ); + rect.SetBottom( wxMin(ch, bottom) ); + return rect; } - // // ------ Grid event classes //