#include "wx/generic/grid.h"
+#ifndef DRAW_LINES
+#define DRAW_LINES 1
+#endif
//////////////////////////////////////////////////////////////////////
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;
//////////////////////////////////////////////////////////////////////
//
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;
}
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
}
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;
+
case WXK_HOME:
case WXK_END:
if ( m_isCellControl )
void wxGridTextCtrl::SetStartValue( const wxString& s )
{
startValue = s;
- wxTextCtrl::SetValue( s.c_str() );
+ wxTextCtrl::SetValue(s);
}
//
// m_owner->PrepareDC( dc );
- wxCoord x, y;
+ int x, y;
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( 0, -y );
//
// m_owner->PrepareDC( dc );
- wxCoord x, y;
+ int x, y;
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
dc.SetDeviceOrigin( -x, 0 );
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, wxRAISED_BORDER )
+ : 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 )
{
BEGIN_EVENT_TABLE( wxGridWindow, wxPanel )
EVT_PAINT( wxGridWindow::OnPaint )
- EVT_SCROLLWIN( wxGridWindow::ScrollWindow )
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
END_EVENT_TABLE()
{
wxPaintDC dc( this );
m_owner->PrepareDC( dc );
-
- m_owner->CalcCellsExposed( GetUpdateRegion() );
+ wxRegion reg = GetUpdateRegion();
+ m_owner->CalcCellsExposed( reg );
m_owner->DrawGridCellArea( dc );
+#if DRAW_LINES
+ m_owner->DrawAllGridLines( dc, reg );
+#endif
}
: wxScrolledWindow( parent, id, pos, size, style, name )
{
Create();
+}
+
+wxGrid::~wxGrid()
+{
+ delete m_table;
+}
+
+
+//
+// ----- internal init and update functions
+//
+
+void wxGrid::Create()
+{
int colLblH = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
int rowLblW = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
SetSizer( m_mainSizer );
}
-wxGrid::~wxGrid()
-{
- delete m_table;
-}
-
-
-//
-// ----- internal init and update functions
-//
-
-void wxGrid::Create()
-{
- m_table = (wxGridTableBase *) NULL;
- m_gridWin = (wxGridWindow *) NULL;
- m_rowLabelWin = (wxGridRowLabelWindow *) NULL;
- m_colLabelWin = (wxGridColLabelWindow *) NULL;
- m_cornerLabelWin = (wxGridCornerLabelWindow *) NULL;
- m_cellEditCtrl = (wxWindow *) NULL;
-}
-
bool wxGrid::CreateGrid( int numRows, int numCols )
{
m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH;
m_defaultRowHeight = m_gridWin->GetCharHeight();
-#if defined (__WXMOTIF__) // see also text ctrl sizing in ShowCellEditControl()
+#if defined(__WXMOTIF__) || defined(__WXGTK__) // see also text ctrl sizing in ShowCellEditControl()
m_defaultRowHeight += 8;
#else
m_defaultRowHeight += 4;
m_gridLineColour = wxColour( 128, 128, 255 );
m_gridLinesEnabled = TRUE;
- m_cursorMode = WXGRID_CURSOR_DEFAULT;
+ m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_dragLastPos = -1;
m_dragRowOrCol = -1;
m_isDragging = FALSE;
"",
wxPoint(1,1),
wxSize(1,1)
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
, wxTE_MULTILINE | wxTE_NO_VSCROLL
#endif
);
//
int x, y;
GetViewStart( &x, &y );
- SetScrollbars( 10, 10,
- right/10, bottom/10,
+ SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE,
+ right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE,
x, y );
}
}
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- dc.SetLogicalFunction(wxXOR);
+ dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
if ( YToEdgeOfRow(y) < 0 )
{
row = YToRow(y);
- if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
+ if ( row >= 0 &&
+ !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
{
SelectRow( row, event.ShiftDown() );
m_cursorMode = WXGRID_CURSOR_SELECT_ROW;
SetRowSize( m_dragRowOrCol, wxMax( y - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
if ( !GetBatchCount() )
{
- // TODO: optimize this
- m_rowLabelWin->Refresh();
- m_gridWin->Refresh();
+ // Only needed to get the correct rect.y:
+ wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) );
+ rect.x = 0;
+ rect.width = m_rowLabelWidth;
+ rect.height = ch - rect.y;
+ m_rowLabelWin->Refresh( TRUE, &rect );
+ rect.width = cw;
+ m_gridWin->Refresh( TRUE, &rect );
}
ShowCellEditControl();
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- dc.SetLogicalFunction(wxXOR);
+ dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
if ( XToEdgeOfCol(x) < 0 )
{
col = XToCol(x);
- if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
+ if ( col >= 0 &&
+ !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
{
SelectCol( col, event.ShiftDown() );
m_cursorMode = WXGRID_CURSOR_SELECT_COL;
if ( !GetBatchCount() )
{
- // TODO: optimize this
- m_colLabelWin->Refresh();
- m_gridWin->Refresh();
+ // Only needed to get the correct rect.x:
+ wxRect rect ( CellToRect( 0, m_dragRowOrCol ) );
+ rect.y = 0;
+ rect.width = cw - rect.x;
+ rect.height = m_colLabelHeight;
+ m_colLabelWin->Refresh( TRUE, &rect );
+ rect.height = ch;
+ m_gridWin->Refresh( TRUE, &rect );
}
ShowCellEditControl();
if ( event.Dragging() )
{
m_isDragging = TRUE;
-
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
+ // Hide the edit control, so it
+ // won't interfer with drag-shrinking.
+ if ( IsCellEditControlEnabled() )
+ HideCellEditControl();
if ( coords != wxGridNoCellCoords )
{
if ( !IsSelection() )
}
else
{
- if ( !IsInSelection( coords ) )
- SelectBlock( m_currentCellCoords, coords );
+ SelectBlock( m_currentCellCoords, coords );
}
}
}
m_isDragging = FALSE;
- if ( event.LeftDown() )
+ if ( coords != wxGridNoCellCoords )
{
- if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+ if ( event.LeftDown() )
{
- MakeCellVisible( coords );
- SetCurrentCell( coords );
+ if ( event.ShiftDown() )
+ {
+ SelectBlock( m_currentCellCoords, coords );
+ }
+ else
+ {
+ if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
+ {
+ MakeCellVisible( coords );
+ SetCurrentCell( coords );
+ }
+ }
}
- }
- // ------------ Left double click
- //
- else if ( event.LeftDClick() )
- {
- SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event );
- }
+ // ------------ Left double click
+ //
+ else if ( event.LeftDClick() )
+ {
+ SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event );
+ }
- // ------------ Left button released
- //
- else if ( event.LeftUp() )
- {
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+ // ------------ Left button released
+ //
+ else if ( event.LeftUp() )
{
- if ( IsSelection() )
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event );
+ if ( IsSelection() )
+ {
+ SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event );
+ }
}
- }
- m_dragLastPos = -1;
- }
+ // Show the edit control, if it has
+ // been hidden for drag-shrinking.
+ if ( IsCellEditControlEnabled() )
+ ShowCellEditControl();
+ m_dragLastPos = -1;
+ }
- // ------------ Right button down
- //
- else if ( event.RightDown() )
- {
- if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+
+ // ------------ Right button down
+ //
+ else if ( event.RightDown() )
{
- // no default action at the moment
+ if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
+ {
+ // no default action at the moment
+ }
}
- }
- // ------------ Right double click
- //
- else if ( event.RightDClick() )
- {
- if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+ // ------------ Right double click
+ //
+ else if ( event.RightDClick() )
{
- // no default action at the moment
+ if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
+ {
+ // no default action at the moment
+ }
}
}
}
MoveCursorRight();
}
break;
+
+ case WXK_SPACE:
+ if ( !IsEditable() )
+ {
+ MoveCursorRight();
+ }
+ else
+ {
+ event.Skip();
+ }
+ break;
case WXK_RETURN:
- MoveCursorDown();
+ if ( event.ControlDown() )
+ {
+ event.Skip(); // to let the edit control have the return
+ }
+ else
+ {
+ MoveCursorDown();
+ }
break;
case WXK_HOME:
if ( m_colWidths[coords.GetCol()] <=0 ||
m_rowHeights[coords.GetRow()] <= 0 ) return;
+#if !DRAW_LINES
if ( m_gridLinesEnabled )
DrawCellBorder( dc, coords );
+#endif
DrawCellBackground( dc, coords );
// This is used to redraw all grid lines e.g. when the grid line colour
// has been changed
//
-void wxGrid::DrawAllGridLines( wxDC& dc )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
{
if ( !m_gridLinesEnabled ||
!m_numRows ||
!m_numCols ) return;
- int cw, ch;
- m_gridWin->GetClientSize(&cw, &ch);
-
- // virtual coords of visible area
- //
int top, bottom, left, right;
- CalcUnscrolledPosition( 0, 0, &left, &top );
- CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+ 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 );
+ }
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
// Make the edit control large enough to allow for internal margins
// TODO: remove this if the text ctrl sizing is improved esp. for unix
//
-#if defined (__WXMOTIF__)
- rect.SetLeft( wxMax(0, left-4) );
- rect.SetTop( wxMax(0, top-4) );
- rect.SetRight( rect.GetRight() + 8 );
- rect.SetBottom( rect.GetBottom() + 8 );
+ 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
+
+#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-2) );
- rect.SetTop( wxMax(0, top-2) );
- rect.SetRight( rect.GetRight() + 4 );
- rect.SetBottom( rect.GetBottom() + 4 );
+ 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
m_cellEditCtrl->SetSize( rect );
void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords )
{
- coords.SetRow( YToRow(y) );
- coords.SetCol( XToCol(x) );
+ int row = YToRow(y);
+ int col = XToCol(x);
+
+ if ( row == -1 || col == -1 )
+ {
+ coords = wxGridNoCellCoords;
+ }
+ else
+ {
+ coords.Set( row, col );
+ }
}
h += m_rowHeights[i];
ypos -= m_rowHeights[i];
}
+
+ // 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;
}
if ( left < 0 )
w += m_colWidths[i];
xpos -= m_colWidths[i];
}
+
+ // see comment for ypos above
+ xpos += GRID_SCROLL_LINE / 2;
}
if ( xpos != -1 || ypos != -1 )
{
- if ( xpos != -1 ) xpos = xpos/10;
- if ( ypos != -1 ) ypos = ypos/10;
+ if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE;
+ if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE;
Scroll( xpos, ypos );
AdjustScrollbars();
}
if ( !GetBatchCount() )
{
m_rowLabelWin->Refresh();
- m_colLabelWin->Refresh();
}
}
if ( !GetBatchCount() )
{
- m_rowLabelWin->Refresh();
m_colLabelWin->Refresh();
}
}
m_table->SetRowLabelValue( row, s );
if ( !GetBatchCount() )
{
- // TODO: Optimize this
- //
- m_rowLabelWin->Refresh();
+ wxRect rect = CellToRect( row, 0);
+ if ( rect.height > 0 )
+ {
+ rect.x = m_left;
+ rect.width = m_rowLabelWidth;
+ m_rowLabelWin->Refresh( TRUE, &rect );
+ }
}
}
}
m_table->SetColLabelValue( col, s );
if ( !GetBatchCount() )
{
- // TODO: optimize this
- //
- m_colLabelWin->Refresh();
+ wxRect rect = CellToRect( 0, col );
+ if ( rect.width > 0 )
+ {
+ rect.y = m_top;
+ rect.height = m_colLabelHeight;
+ m_colLabelWin->Refresh( TRUE, &rect );
+ }
}
}
}
if ( IsSelection() && addToSelected )
{
- if ( m_selectedTopLeft.GetRow() > row )
+ 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 ( oldTop > row )
+ {
+ need_refresh[0] = TRUE;
+ rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
+ wxGridCellCoords ( oldTop - 1,
+ m_numCols - 1 ) );
m_selectedTopLeft.SetRow( row );
+ }
+
+ if ( oldLeft > 0 )
+ {
+ need_refresh[1] = TRUE;
+ rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
+ wxGridCellCoords ( oldBottom,
+ oldLeft - 1 ) );
- m_selectedTopLeft.SetCol( 0 );
+ m_selectedTopLeft.SetCol( 0 );
+ }
- if ( m_selectedBottomRight.GetRow() < row )
+ if ( oldBottom < row )
+ {
+ need_refresh[2] = TRUE;
+ rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
+ wxGridCellCoords ( row,
+ m_numCols - 1 ) );
m_selectedBottomRight.SetRow( row );
+ }
- m_selectedBottomRight.SetCol( m_numCols - 1 );
+ if ( oldRight < m_numCols - 1 )
+ {
+ need_refresh[3] = TRUE;
+ rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop ,
+ oldRight + 1 ),
+ wxGridCellCoords ( oldBottom,
+ m_numCols - 1 ) );
+ m_selectedBottomRight.SetCol( m_numCols - 1 );
+ }
- // TODO: optimize this so that we only refresh the newly
- // selected cells
- //
- r = SelectionToDeviceRect();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( TRUE, &(rect[i]) );
}
else
{
void wxGrid::SelectCol( int col, bool addToSelected )
{
- wxRect r;
-
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 );
+ }
- // TODO: optimize this so that we only refresh the newly
- // selected cells
- //
- r = SelectionToDeviceRect();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( TRUE, &(rect[i]) );
}
else
{
+ wxRect r;
+
r = SelectionToDeviceRect();
ClearSelection();
if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
{
int temp;
+ wxGridCellCoords updateTopLeft, updateBottomRight;
if ( topRow > bottomRow )
{
rightCol = temp;
}
- m_selectedTopLeft.Set( topRow, leftCol );
- m_selectedBottomRight.Set( bottomRow, rightCol );
+ updateTopLeft = wxGridCellCoords( topRow, leftCol );
+ updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
- wxRect r;
- r = SelectionToDeviceRect();
- m_gridWin->Refresh( TRUE, &r );
+ if ( m_selectedTopLeft != updateTopLeft ||
+ m_selectedBottomRight != updateBottomRight )
+ {
+ // 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( TRUE, &(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
}
-// This function returns the rectangle that encloses the selected cells
+// This function returns the rectangle that encloses the given block
// in device coords clipped to the client size of the grid window.
//
-wxRect wxGrid::SelectionToDeviceRect()
+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( 0, 0, 0, 0 );
- }
-
- cellRect = CellToRect( m_selectedBottomRight );
- 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 = cellRect;
+ }
+ else
+ {
+ rect = wxRect( 0, 0, 0, 0 );
+ }
- rect.SetLeft( wxMax(0, left) );
- rect.SetTop( wxMax(0, top) );
- rect.SetRight( wxMin(cw, right) );
- rect.SetBottom( wxMin(ch, bottom) );
+ 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
//
projects / wxWidgets.git / blobdiff