default:
// additionally accept 'e' as in '1e+6'
if ( (keycode < 128) &&
- (isdigit(keycode) || tolower(keycode) == wxT('e')) )
+ (isdigit(keycode) || tolower(keycode) == 'e') )
return TRUE;
}
}
if ( pos >= curNumRows )
{
- wxString errmsg;
- errmsg.Printf(wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\nPos value is invalid for present table with %d rows"),
- pos, numRows, curNumRows );
- wxFAIL_MSG( errmsg );
+ wxFAIL_MSG( wxString::Format
+ (
+ wxT("Called wxGridStringTable::DeleteRows(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu rows"),
+ (unsigned long)pos,
+ (unsigned long)numRows,
+ (unsigned long)curNumRows
+ ) );
+
return FALSE;
}
if ( pos >= curNumCols )
{
- wxString errmsg;
- errmsg.Printf( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\nPos value is invalid for present table with %d cols"),
- pos, numCols, curNumCols );
- wxFAIL_MSG( errmsg );
+ wxFAIL_MSG( wxString::Format
+ (
+ wxT("Called wxGridStringTable::DeleteCols(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu cols"),
+ (unsigned long)pos,
+ (unsigned long)numCols,
+ (unsigned long)curNumCols
+ ) );
return FALSE;
}
m_selection->SetSelectionMode( selmode );
}
+wxGrid::wxGridSelectionModes wxGrid::GetSelectionMode() const
+{
+ wxCHECK_MSG( m_created, wxGrid::wxGridSelectCells,
+ wxT("Called wxGrid::GetSelectionMode() before calling CreateGrid()") );
+
+ return m_selection->GetSelectionMode();
+}
+
bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
wxGrid::wxGridSelectionModes selmode )
{
// removed, not only if the cell "underneath" it actually changes.
// For now, I intentionally do not save the editor's content as the
// cell it might want to save that stuff to might no longer exist.
- DisableCellEditControl();
+ HideCellEditControl();
#if 0
// if we were using the default widths/heights so far, we must change them
// now
wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW
}
-void wxGrid::Refresh(bool eraseb, wxRect* rect)
+void wxGrid::Refresh(bool eraseb, const wxRect* rect)
{
// Don't do anything if between Begin/EndBatch...
// EndBatch() will do all this on the last nested one anyway.
if (! GetBatchCount())
{
+ // Refresh to get correct scrolled position:
wxScrolledWindow::Refresh(eraseb,rect);
- int off_x=0 ,off_y=0;
- wxRect * anotherrect = NULL ;
-
if (rect)
{
+ int rect_x, rect_y, rectWidth, rectHeight;
+ int width_label, width_cell, height_label, height_cell;
+ int x, y;
+
//Copy rectangle can get scroll offsets..
- anotherrect = new wxRect(*rect);
- CalcScrolledPosition( 0, 0, &off_x, &off_y );
- }
- //Corner label Doesn't move from the origin.
- m_cornerLabelWin->Refresh(eraseb,rect);
+ rect_x = rect->GetX();
+ rect_y = rect->GetY();
+ rectWidth = rect->GetWidth();
+ rectHeight = rect->GetHeight();
- //Move Rect down for row labels...
- if (rect)
- rect->Offset(0,off_y);
- m_rowLabelWin->Refresh(eraseb,rect);
+ width_label = m_rowLabelWidth - rect_x;
+ if (width_label > rectWidth) width_label = rectWidth;
- //Move rect copy along for col labels...
- if (anotherrect)
- anotherrect->Offset(off_x,0);
- m_colLabelWin->Refresh(eraseb,anotherrect);
+ height_label = m_colLabelHeight - rect_y;
+ if (height_label > rectHeight) height_label = rectHeight;
- //Move main rect along (so it's down and across!)
- // for cell window.
- if (rect)
- rect->Offset(off_x,0);
- m_gridWin->Refresh(eraseb,rect);
+ if (rect_x > m_rowLabelWidth)
+ {
+ x = rect_x - m_rowLabelWidth;
+ width_cell = rectWidth;
+ }
+ else
+ {
+ x = 0;
+ width_cell = rectWidth - (m_rowLabelWidth - rect_x);
+ }
+
+ if (rect_y > m_colLabelHeight)
+ {
+ y = rect_y - m_colLabelHeight;
+ height_cell = rectHeight;
+ }
+ else
+ {
+ y = 0;
+ height_cell = rectHeight - (m_colLabelHeight - rect_y);
+ }
+
+ // Paint corner label part intersecting rect.
+ if ( width_label > 0 && height_label > 0 )
+ {
+ wxRect anotherrect(rect_x, rect_y, width_label, height_label);
+ m_cornerLabelWin->Refresh(eraseb, &anotherrect);
+ }
+
+ // Paint col labels part intersecting rect.
+ if ( width_cell > 0 && height_label > 0 )
+ {
+ wxRect anotherrect(x, rect_y, width_cell, height_label);
+ m_colLabelWin->Refresh(eraseb, &anotherrect);
+ }
+
+ // Paint row labels part intersecting rect.
+ if ( width_label > 0 && height_cell > 0 )
+ {
+ wxRect anotherrect(rect_x, y, width_label, height_cell);
+ m_rowLabelWin->Refresh(eraseb, &anotherrect);
+ }
+
+ // Paint cell area part intersecting rect.
+ if ( width_cell > 0 && height_cell > 0 )
+ {
+ wxRect anotherrect(x, y, width_cell, height_cell);
+ m_gridWin->Refresh(eraseb, &anotherrect);
+ }
+ }
+ else
+ {
+ m_cornerLabelWin->Refresh(eraseb, NULL);
+ m_colLabelWin->Refresh(eraseb, NULL);
+ m_rowLabelWin->Refresh(eraseb, NULL);
+ m_gridWin->Refresh(eraseb, NULL);
+ }
}
}
bool wxGrid::GetModelValues()
{
+ // Hide the editor, so it won't hide a changed value.
+ HideCellEditControl();
+
if ( m_table )
{
// all we need to do is repaint the grid
{
int row, col;
+ // Disable the editor, so it won't hide a changed value.
+ // Do we also want to save the current value of the editor first?
+ // I think so ...
+ DisableCellEditControl();
+
if ( m_table )
{
for ( row = 0; row < m_numRows; row++ )
i_min = 0;
if (BorderArray.IsEmpty())
{
- return i_max;
+ return maxOnOverflow ? (int)i_max : -1;
}
if ( i_max >= BorderArray.GetCount())
col <= m_selectingBottomRight.GetCol() )) );
}
+wxGridCellCoordsArray wxGrid::GetSelectedCells() const
+{
+ if (!m_selection) { wxGridCellCoordsArray a; return a; }
+ return m_selection->m_cellSelection;
+}
+wxGridCellCoordsArray wxGrid::GetSelectionBlockTopLeft() const
+{
+ if (!m_selection) { wxGridCellCoordsArray a; return a; }
+ return m_selection->m_blockSelectionTopLeft;
+}
+wxGridCellCoordsArray wxGrid::GetSelectionBlockBottomRight() const
+{
+ if (!m_selection) { wxGridCellCoordsArray a; return a; }
+ return m_selection->m_blockSelectionTopLeft;
+}
+wxArrayInt wxGrid::GetSelectedRows() const
+{
+ if (!m_selection) { wxArrayInt a; return a; }
+ return m_selection->m_rowSelection;
+}
+wxArrayInt wxGrid::GetSelectedCols() const
+{
+ if (!m_selection) { wxArrayInt a; return a; }
+ return m_selection->m_colSelection;
+}
+
+
void wxGrid::ClearSelection()
{
m_selectingTopLeft = wxGridNoCellCoords;
projects / wxWidgets.git / blobdiff