When pasting into a fp_lib_table with no initial rows, start at column zero, not -1.

This commit is contained in:
Dick Hollenbeck 2013-10-22 09:29:48 -05:00
parent 1c3f23ba1d
commit 5862306295
1 changed files with 8 additions and 7 deletions

View File

@ -251,16 +251,16 @@ class DIALOG_FP_LIB_TABLE : public DIALOG_FP_LIB_TABLE_BASE
int selRowCount; int selRowCount;
int selColCount; int selColCount;
int getCursorRow() const
{
return m_cur_grid->GetGridCursorRow();
}
int getCursorCol() const int getCursorCol() const
{ {
return m_cur_grid->GetGridCursorCol(); return m_cur_grid->GetGridCursorCol();
} }
int getCursorRow() const
{
return m_cur_grid->GetGridCursorRow();
}
/// Gets the selected area into a sensible rectangle of sel{Row,Col}{Start,Count} above. /// Gets the selected area into a sensible rectangle of sel{Row,Col}{Start,Count} above.
void getSelectedArea() void getSelectedArea()
{ {
@ -893,8 +893,9 @@ void DIALOG_FP_LIB_TABLE::paste()
} }
else else
{ {
const int cur_row = getCursorRow(); const int cur_row = getCursorRow(); // -1 is ok
const int cur_col = getCursorCol(); const int cur_col = std::max( getCursorCol(), 0 ); // no -1
wxStringTokenizer rows( cb_text, ROW_SEP, wxTOKEN_RET_EMPTY ); wxStringTokenizer rows( cb_text, ROW_SEP, wxTOKEN_RET_EMPTY );
// if clipboard rows would extend past end of current table size... // if clipboard rows would extend past end of current table size...