X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1da81074ceaf318fbff330a3694e2d9e0e987cd..01a4679360888aa030c31ea194a676b12ed52b92:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 097a75dcaf..2f12b4028e 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -203,6 +203,8 @@ public: void ScrollWindow( int dx, int dy, const wxRect *rect ); + wxGrid* GetOwner() { return m_owner; } + private: wxGrid *m_owner; wxGridRowLabelWindow *m_rowLabelWin; @@ -424,6 +426,7 @@ static inline int GetScrollY(int y) wxGridCellEditor::wxGridCellEditor() { m_control = NULL; + m_attr = NULL; } @@ -445,6 +448,10 @@ void wxGridCellEditor::PaintBackground(const wxRect& rectCell, { // erase the background because we might not fill the cell wxClientDC dc(m_control->GetParent()); + wxGridWindow* gridWindow = wxDynamicCast(m_control->GetParent(), wxGridWindow); + if (gridWindow) + gridWindow->GetOwner()->PrepareDC(dc); + dc.SetPen(*wxTRANSPARENT_PEN); dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); dc.DrawRectangle(rectCell); @@ -629,6 +636,7 @@ void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue) { Text()->SetValue(startValue); Text()->SetInsertionPointEnd(); + Text()->SetSelection(-1,-1); Text()->SetFocus(); } @@ -721,7 +729,7 @@ void wxGridCellTextEditor::HandleReturn( wxKeyEvent& // wxMotif needs a little extra help... size_t pos = (size_t)( Text()->GetInsertionPoint() ); wxString s( Text()->GetValue() ); - s = s.Left(pos) + "\n" + s.Mid(pos); + s = s.Left(pos) + wxT("\n") + s.Mid(pos); Text()->SetValue(s); Text()->SetInsertionPoint( pos ); #else @@ -752,6 +760,12 @@ void wxGridCellTextEditor::SetParameters(const wxString& params) } } +// return the value in the text control +wxString wxGridCellTextEditor::GetValue() const +{ + return Text()->GetValue(); +} + // ---------------------------------------------------------------------------- // wxGridCellNumberEditor // ---------------------------------------------------------------------------- @@ -797,8 +811,9 @@ void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid) } else { + m_valueOld = 0; wxString sValue = table->GetValue(row, col); - if (! sValue.ToLong(&m_valueOld)) + if (! sValue.ToLong(&m_valueOld) && ! sValue.IsEmpty()) { wxFAIL_MSG( _T("this cell doesn't have numeric value") ); return; @@ -820,16 +835,20 @@ bool wxGridCellNumberEditor::EndEdit(int row, int col, wxGrid* grid) { bool changed; - long value; + long value = 0; + wxString text; if ( HasRange() ) { value = Spin()->GetValue(); changed = value != m_valueOld; + if (changed) + text = wxString::Format(wxT("%ld"), value); } else { - changed = Text()->GetValue().ToLong(&value) && (value != m_valueOld); + text = Text()->GetValue(); + changed = (text.IsEmpty() || text.ToLong(&value)) && (value != m_valueOld); } if ( changed ) @@ -837,7 +856,7 @@ bool wxGridCellNumberEditor::EndEdit(int row, int col, if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER)) grid->GetTable()->SetValueAsLong(row, col, value); else - grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%ld"), value)); + grid->GetTable()->SetValue(row, col, text); } return changed; @@ -894,7 +913,21 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) if ( !HasRange() ) { int keycode = (int) event.KeyCode(); - if ( isdigit(keycode) || keycode == '+' || keycode == '-' ) + if ( isdigit(keycode) || keycode == '+' || keycode == '-' + || keycode == WXK_NUMPAD0 + || keycode == WXK_NUMPAD1 + || keycode == WXK_NUMPAD2 + || keycode == WXK_NUMPAD3 + || keycode == WXK_NUMPAD4 + || keycode == WXK_NUMPAD5 + || keycode == WXK_NUMPAD6 + || keycode == WXK_NUMPAD7 + || keycode == WXK_NUMPAD8 + || keycode == WXK_NUMPAD9 + || keycode == WXK_ADD + || keycode == WXK_NUMPAD_ADD + || keycode == WXK_SUBTRACT + || keycode == WXK_NUMPAD_SUBTRACT) { wxGridCellTextEditor::StartingKey(event); @@ -934,6 +967,23 @@ void wxGridCellNumberEditor::SetParameters(const wxString& params) } } +// return the value in the spin control if it is there (the text control otherwise) +wxString wxGridCellNumberEditor::GetValue() const +{ + wxString s; + + if( HasRange() ) + { + long value = Spin()->GetValue(); + s.Printf(wxT("%ld"), value); + } + else + { + s = Text()->GetValue(); + } + return s; +} + // ---------------------------------------------------------------------------- // wxGridCellFloatEditor // ---------------------------------------------------------------------------- @@ -965,8 +1015,9 @@ void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid) } else { + m_valueOld = 0.0; wxString sValue = table->GetValue(row, col); - if (! sValue.ToDouble(&m_valueOld)) + if (! sValue.ToDouble(&m_valueOld) && ! sValue.IsEmpty()) { wxFAIL_MSG( _T("this cell doesn't have float value") ); return; @@ -979,20 +1030,19 @@ void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid) bool wxGridCellFloatEditor::EndEdit(int row, int col, wxGrid* grid) { - double value; - if ( Text()->GetValue().ToDouble(&value) && (value != m_valueOld) ) + double value = 0.0; + wxString text(Text()->GetValue()); + + if ( (text.IsEmpty() || text.ToDouble(&value)) && (value != m_valueOld) ) { if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT)) grid->GetTable()->SetValueAsDouble(row, col, value); else - grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%f"), value)); + grid->GetTable()->SetValue(row, col, text); return TRUE; } - else - { - return FALSE; - } + return FALSE; } void wxGridCellFloatEditor::Reset() @@ -1003,8 +1053,21 @@ void wxGridCellFloatEditor::Reset() void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) { int keycode = (int)event.KeyCode(); - if ( isdigit(keycode) || - keycode == '+' || keycode == '-' || keycode == '.' ) + if ( isdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.' + || keycode == WXK_NUMPAD0 + || keycode == WXK_NUMPAD1 + || keycode == WXK_NUMPAD2 + || keycode == WXK_NUMPAD3 + || keycode == WXK_NUMPAD4 + || keycode == WXK_NUMPAD5 + || keycode == WXK_NUMPAD6 + || keycode == WXK_NUMPAD7 + || keycode == WXK_NUMPAD8 + || keycode == WXK_NUMPAD9 + || keycode == WXK_ADD + || keycode == WXK_NUMPAD_ADD + || keycode == WXK_SUBTRACT + || keycode == WXK_NUMPAD_SUBTRACT) { wxGridCellTextEditor::StartingKey(event); @@ -1049,16 +1112,16 @@ wxString wxGridCellFloatEditor::GetString() const if ( m_width == -1 ) { // default width/precision - fmt = _T("%g"); + fmt = _T("%f"); } else if ( m_precision == -1 ) { // default precision - fmt.Printf(_T("%%%d.g"), m_width); + fmt.Printf(_T("%%%d.f"), m_width); } else { - fmt.Printf(_T("%%%d.%dg"), m_width, m_precision); + fmt.Printf(_T("%%%d.%df"), m_width, m_precision); } return wxString::Format(fmt, m_valueOld); @@ -1160,7 +1223,32 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r) size.y -= 2; #endif - m_control->Move(r.x + r.width/2 - size.x/2, r.y + r.height/2 - size.y/2); + int hAlign = wxALIGN_CENTRE; + int vAlign = wxALIGN_CENTRE; + if (GetCellAttr()) + GetCellAttr()->GetAlignment(& hAlign, & vAlign); + + int x = 0, y = 0; + if (hAlign == wxALIGN_LEFT) + { + x = r.x + 2; +#ifdef __WXMSW__ + x += 2; +#endif + y = r.y + r.height/2 - size.y/2; + } + else if (hAlign == wxALIGN_RIGHT) + { + x = r.x + r.width - size.x - 2; + y = r.y + r.height/2 - size.y/2; + } + else if (hAlign == wxALIGN_CENTRE) + { + x = r.x + r.width/2 - size.x/2; + y = r.y + r.height/2 - size.y/2; + } + + m_control->Move(x, y); } void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr) @@ -1184,7 +1272,7 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) else { wxString cellval( grid->GetTable()->GetValue(row, col) ); - m_startValue = !( !cellval || (cellval == "0") ); + m_startValue = !( !cellval || (cellval == wxT("0")) ); } CBox()->SetValue(m_startValue); CBox()->SetFocus(); @@ -1248,6 +1336,13 @@ bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event) return FALSE; } +// return the value as "1" for true and the empty string for false +wxString wxGridCellBoolEditor::GetValue() const +{ + bool bSet = CBox()->GetValue(); + return bSet ? _T("1") : wxEmptyString; +} + #endif // wxUSE_CHECKBOX #if wxUSE_COMBOBOX @@ -1320,15 +1415,15 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) m_startValue = grid->GetTable()->GetValue(row, col); - Combo()->SetValue(m_startValue); - size_t count = m_choices.GetCount(); - for (size_t i=0; iSetValue(m_startValue); + else { - if (m_startValue == m_choices[i]) - { - Combo()->SetSelection(i); - break; - } + // find the right position, or default to the first if not found + int pos = Combo()->FindString(m_startValue); + if (pos == -1) + pos = 0; + Combo()->SetSelection(pos); } Combo()->SetInsertionPointEnd(); Combo()->SetFocus(); @@ -1344,7 +1439,10 @@ bool wxGridCellChoiceEditor::EndEdit(int row, int col, grid->GetTable()->SetValue(row, col, value); m_startValue = wxEmptyString; - Combo()->SetValue(m_startValue); + if (m_allowOthers) + Combo()->SetValue(m_startValue); + else + Combo()->SetSelection(0); return changed; } @@ -1372,6 +1470,12 @@ void wxGridCellChoiceEditor::SetParameters(const wxString& params) } } +// return the value in the text control +wxString wxGridCellChoiceEditor::GetValue() const +{ + return Combo()->GetValue(); +} + #endif // wxUSE_COMBOBOX // ---------------------------------------------------------------------------- @@ -1449,13 +1553,21 @@ void wxGridCellRenderer::Draw(wxGrid& grid, { dc.SetBackgroundMode( wxSOLID ); - if ( isSelected ) + // grey out fields if the grid is disabled + if( grid.IsEnabled() ) { - dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); - } + if ( isSelected ) + { + dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); + } + else + { + dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); + } + } else { - dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); + dc.SetBrush(wxBrush(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID)); } dc.SetPen( *wxTRANSPARENT_PEN ); @@ -1475,15 +1587,24 @@ void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid, // TODO some special colours for attr.IsReadOnly() case? - if ( isSelected ) + // different coloured text when the grid is disabled + if( grid.IsEnabled() ) { - dc.SetTextBackground( grid.GetSelectionBackground() ); - dc.SetTextForeground( grid.GetSelectionForeground() ); + if ( isSelected ) + { + dc.SetTextBackground( grid.GetSelectionBackground() ); + dc.SetTextForeground( grid.GetSelectionForeground() ); + } + else + { + dc.SetTextBackground( attr.GetBackgroundColour() ); + dc.SetTextForeground( attr.GetTextColour() ); + } } else { - dc.SetTextBackground( attr.GetBackgroundColour() ); - dc.SetTextForeground( attr.GetTextColour() ); + dc.SetTextBackground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)); + dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_GRAYTEXT)); } dc.SetFont( attr.GetFont() ); @@ -1522,16 +1643,85 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, int row, int col, bool isSelected) { - wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); + wxRect rect = rectCell; + rect.Inflate(-1); - // now we only have to draw the text - SetTextColoursAndFont(grid, attr, dc, isSelected); + // erase only this cells background, overflow cells should have been erased + wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); int hAlign, vAlign; attr.GetAlignment(&hAlign, &vAlign); - wxRect rect = rectCell; - rect.Inflate(-1); + int overflowCols = 0; + + if (attr.GetOverflow()) + { + int cols = grid.GetNumberCols(); + int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth(); + int cell_rows, cell_cols; + attr.GetSize( &cell_rows, &cell_cols ); // shouldn't get here if <=0 + if ((best_width > rectCell.width) && (col < cols) && grid.GetTable()) + { + int i, c_cols, c_rows; + for (i = col+cell_cols; i < cols; i++) + { + bool is_empty = TRUE; + for (int j=row; j 0) c_rows = 0; + if (!grid.GetTable()->IsEmptyCell(j+c_rows, i)) + { + is_empty = FALSE; + break; + } + } + if (is_empty) + rect.width += grid.GetColSize(i); + else + { + i--; + break; + } + if (rect.width >= best_width) break; + } + overflowCols = i - col - cell_cols + 1; + if (overflowCols >= cols) overflowCols = cols - 1; + } + + if (overflowCols > 0) // redraw overflow cells w/ proper hilight + { + hAlign = wxALIGN_LEFT; // if oveflowed then it's left aligned + wxRect clip = rect; + clip.x += rectCell.width; + // draw each overflow cell individually + int col_end = col+cell_cols+overflowCols; + if (col_end >= grid.GetNumberCols()) + col_end = grid.GetNumberCols() - 1; + for (int i = col+cell_cols; i <= col_end; i++) + { + clip.width = grid.GetColSize(i) - 1; + dc.DestroyClippingRegion(); + dc.SetClippingRegion(clip); + + SetTextColoursAndFont(grid, attr, dc, + grid.IsInSelection(row,i)); + + grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), + rect, hAlign, vAlign); + clip.x += grid.GetColSize(i) - 1; + } + + rect = rectCell; + rect.Inflate(-1); + rect.width++; + dc.DestroyClippingRegion(); + } + } + + // now we only have to draw the text + SetTextColoursAndFont(grid, attr, dc, isSelected); grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), rect, hAlign, vAlign); @@ -1633,9 +1823,9 @@ wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col) { if ( m_precision == -1 ) { - // default width/precision - m_format = _T("%f"); - } + // default width/precision + m_format = _T("%f"); + } else { m_format.Printf(_T("%%.%df"), m_precision); @@ -1792,11 +1982,31 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, } // draw a border around checkmark + int vAlign, hAlign; + attr.GetAlignment(& hAlign, &vAlign); + wxRect rectBorder; - rectBorder.x = rect.x + rect.width/2 - size.x/2; - rectBorder.y = rect.y + rect.height/2 - size.y/2; - rectBorder.width = size.x; - rectBorder.height = size.y; + if (hAlign == wxALIGN_CENTRE) + { + rectBorder.x = rect.x + rect.width/2 - size.x/2; + rectBorder.y = rect.y + rect.height/2 - size.y/2; + rectBorder.width = size.x; + rectBorder.height = size.y; + } + else if (hAlign == wxALIGN_LEFT) + { + rectBorder.x = rect.x + 2; + rectBorder.y = rect.y + rect.height/2 - size.y/2; + rectBorder.width = size.x; + rectBorder.height = size.y; + } + else if (hAlign == wxALIGN_RIGHT) + { + rectBorder.x = rect.x + rect.width - size.x - 2; + rectBorder.y = rect.y + rect.height/2 - size.y/2; + rectBorder.width = size.x; + rectBorder.height = size.y; + } bool value; if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) ) @@ -1804,7 +2014,7 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, else { wxString cellval( grid.GetTable()->GetValue(row, col) ); - value = !( !cellval || (cellval == "0") ); + value = !( !cellval || (cellval == wxT("0")) ); } if ( value ) @@ -1843,6 +2053,9 @@ void wxGridCellAttr::Init(wxGridCellAttr *attrDefault) m_attrkind = wxGridCellAttr::Cell; + m_sizeRows = m_sizeCols = 1; + m_overflow = TRUE; + SetDefAttr(attrDefault); } @@ -1859,6 +2072,8 @@ wxGridCellAttr *wxGridCellAttr::Clone() const if ( HasAlignment() ) attr->SetAlignment(m_hAlign, m_vAlign); + attr->SetSize( m_sizeRows, m_sizeCols ); + if ( m_renderer ) { attr->SetRenderer(m_renderer); @@ -1886,12 +2101,14 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) SetBackgroundColour(mergefrom->GetBackgroundColour()); if ( !HasFont() && mergefrom->HasFont() ) SetFont(mergefrom->GetFont()); - if ( !!HasAlignment() && mergefrom->HasAlignment() ){ + if ( !HasAlignment() && mergefrom->HasAlignment() ){ int hAlign, vAlign; mergefrom->GetAlignment( &hAlign, &vAlign); SetAlignment(hAlign, vAlign); } + mergefrom->GetSize( &m_sizeRows, &m_sizeCols ); + // Directly access member functions as GetRender/Editor don't just return // m_renderer/m_editor // @@ -1912,6 +2129,27 @@ void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) SetDefAttr(mergefrom->m_defGridAttr); } +void wxGridCellAttr::SetSize(int num_rows, int num_cols) +{ + // The size of a cell is normally 1,1 + + // If this cell is larger (2,2) then this is the top left cell + // the other cells that will be covered (lower right cells) must be + // set to negative or zero values such that + // row + num_rows of the covered cell points to the larger cell (this cell) + // same goes for the col + num_cols. + + // Size of 0,0 is NOT valid, neither is <=0 and any positive value + + wxASSERT_MSG( (!((num_rows>0)&&(num_cols<=0)) || + !((num_rows<=0)&&(num_cols>0)) || + !((num_rows==0)&&(num_cols==0))), + wxT("wxGridCellAttr::SetSize only takes two postive values or negative/zero values")); + + m_sizeRows = num_rows; + m_sizeCols = num_cols; +} + const wxColour& wxGridCellAttr::GetTextColour() const { if (HasTextColour()) @@ -1973,6 +2211,11 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const } } +void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const +{ + if ( num_rows ) *num_rows = m_sizeRows; + if ( num_cols ) *num_cols = m_sizeCols; +} // GetRenderer and GetEditor use a slightly different decision path about // which attribute to use. If a non-default attr object has one then it is @@ -2850,21 +3093,13 @@ wxGridStringTable::wxGridStringTable() wxGridStringTable::wxGridStringTable( int numRows, int numCols ) : wxGridTableBase() { - int row, col; - m_data.Alloc( numRows ); wxArrayString sa; sa.Alloc( numCols ); - for ( col = 0; col < numCols; col++ ) - { - sa.Add( wxEmptyString ); - } + sa.Add( wxEmptyString, numCols ); - for ( row = 0; row < numRows; row++ ) - { - m_data.Add( sa ); - } + m_data.Add( sa, numRows ); } wxGridStringTable::~wxGridStringTable() @@ -2931,8 +3166,6 @@ void wxGridStringTable::Clear() bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) { - size_t row, col; - size_t curNumRows = m_data.GetCount(); size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : ( GetView() ? GetView()->GetNumberCols() : 0 ) ); @@ -2944,15 +3177,8 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) wxArrayString sa; sa.Alloc( curNumCols ); - for ( col = 0; col < curNumCols; col++ ) - { - sa.Add( wxEmptyString ); - } - - for ( row = pos; row < pos + numRows; row++ ) - { - m_data.Insert( sa, row ); - } + sa.Add( wxEmptyString, curNumCols ); + m_data.Insert( sa, pos, numRows ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -2968,8 +3194,6 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) bool wxGridStringTable::AppendRows( size_t numRows ) { - size_t row, col; - size_t curNumRows = m_data.GetCount(); size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : ( GetView() ? GetView()->GetNumberCols() : 0 ) ); @@ -2978,16 +3202,10 @@ bool wxGridStringTable::AppendRows( size_t numRows ) if ( curNumCols > 0 ) { sa.Alloc( curNumCols ); - for ( col = 0; col < curNumCols; col++ ) - { - sa.Add( wxEmptyString ); - } + sa.Add( wxEmptyString, curNumCols ); } - for ( row = 0; row < numRows; row++ ) - { - m_data.Add( sa ); - } + m_data.Add( sa, numRows ); if ( GetView() ) { @@ -3003,16 +3221,18 @@ bool wxGridStringTable::AppendRows( size_t numRows ) bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) { - size_t n; - size_t curNumRows = m_data.GetCount(); 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; } @@ -3023,14 +3243,11 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) if ( numRows >= curNumRows ) { - m_data.Empty(); // don't release memory just yet + m_data.Clear(); } else { - for ( n = 0; n < numRows; n++ ) - { - m_data.RemoveAt( pos ); - } + m_data.RemoveAt( pos, numRows ); } if ( GetView() ) { @@ -3080,7 +3297,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) bool wxGridStringTable::AppendCols( size_t numCols ) { - size_t row, n; + size_t row; size_t curNumRows = m_data.GetCount(); #if 0 @@ -3095,10 +3312,7 @@ bool wxGridStringTable::AppendCols( size_t numCols ) for ( row = 0; row < curNumRows; row++ ) { - for ( n = 0; n < numCols; n++ ) - { - m_data[row].Add( wxEmptyString ); - } + m_data[row].Add( wxEmptyString, numCols ); } if ( GetView() ) @@ -3115,7 +3329,7 @@ bool wxGridStringTable::AppendCols( size_t numCols ) bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) { - size_t row, n; + size_t row; size_t curNumRows = m_data.GetCount(); size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : @@ -3123,10 +3337,13 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) 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; } @@ -3143,10 +3360,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) } else { - for ( n = 0; n < numCols; n++ ) - { - m_data[row].RemoveAt( pos ); - } + m_data[row].RemoveAt( pos, numCols ); } } if ( GetView() ) @@ -3382,13 +3596,15 @@ void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) int client_width = 0; GetClientSize( &client_width, &client_height ); - dc.SetPen( *wxBLACK_PEN ); + dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) ); 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 ); + + dc.SetPen( *wxWHITE_PEN ); + dc.DrawLine( 1, 1, client_width-1, 1 ); + dc.DrawLine( 1, 1, 1, client_height-1 ); } @@ -3434,8 +3650,12 @@ END_EVENT_TABLE() wxGridWindow::wxGridWindow( wxGrid *parent, wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, - wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size, wxWANTS_CHARS, "grid window" ) + wxWindowID id, + const wxPoint &pos, + const wxSize &size ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxCLIP_CHILDREN, + wxT("grid window") ) + { m_owner = parent; m_rowLabelWin = rowLblWin; @@ -3502,6 +3722,24 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) ////////////////////////////////////////////////////////////////////// +// Internal Helper function for computing row or column from some +// (unscrolled) coordinate value, using either +// m_defaultRowHeight/m_defaultColWidth or binary search on array +// of m_rowBottoms/m_ColRights to speed up the search! + +// Internal helper macros for simpler use of that function + +static int CoordToRowOrCol(int coord, int defaultDist, int minDist, + const wxArrayInt& BorderArray, int nMax, + bool maxOnOverflow); + +#define internalXToCol(x) CoordToRowOrCol(x, m_defaultColWidth, \ + WXGRID_MIN_COL_WIDTH, \ + m_colRights, m_numCols, TRUE) +#define internalYToRow(y) CoordToRowOrCol(y, m_defaultRowHeight, \ + WXGRID_MIN_ROW_HEIGHT, \ + m_rowBottoms, m_numRows, TRUE) +///////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow ) @@ -3587,7 +3825,8 @@ void wxGrid::Create() // create the type registry m_typeRegistry = new wxGridTypeRegistry; - m_selection = 0; + m_selection = NULL; + // subwindow components that make up the wxGrid m_cornerLabelWin = new wxGridCornerLabelWindow( this, -1, @@ -3647,15 +3886,23 @@ void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode) 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 ) { if ( m_created ) { // RD: Actually, this should probably be allowed. I think it would be - // nice to be able to switch multiple Tables in and out of a single - // View at runtime. Is there anything in the implmentation that would - // prevent this? + // nice to be able to switch multiple Tables in and out of a single + // View at runtime. Is there anything in the implementation that + // would prevent this? // At least, you now have to cope with m_selection wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); @@ -3699,17 +3946,20 @@ void wxGrid::Init() // init attr cache m_attrCache.row = -1; + m_attrCache.col = -1; + m_attrCache.attr = NULL; // TODO: something better than this ? // m_labelFont = this->GetFont(); - m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 ); +// m_labelFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); +// m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 ); - m_rowLabelHorizAlign = wxALIGN_LEFT; + m_rowLabelHorizAlign = wxALIGN_CENTRE; m_rowLabelVertAlign = wxALIGN_CENTRE; m_colLabelHorizAlign = wxALIGN_CENTRE; - m_colLabelVertAlign = wxALIGN_TOP; + m_colLabelVertAlign = wxALIGN_CENTRE; m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH; m_defaultRowHeight = m_gridWin->GetCharHeight(); @@ -3720,9 +3970,9 @@ void wxGrid::Init() m_defaultRowHeight += 4; #endif - m_gridLineColour = wxColour( 128, 128, 255 ); + m_gridLineColour = wxColour( 192,192,192 ); m_gridLinesEnabled = TRUE; - m_cellHighlightColour = m_gridLineColour; + m_cellHighlightColour = *wxBLACK; m_cellHighlightPenWidth = 2; m_cellHighlightROPenWidth = 1; @@ -3745,8 +3995,10 @@ void wxGrid::Init() m_selectingTopLeft = wxGridNoCellCoords; m_selectingBottomRight = wxGridNoCellCoords; - m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); +// m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); +// m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); + m_selectionBackground = *wxBLACK; + m_selectionForeground = *wxWHITE; m_editable = TRUE; // default for whole grid @@ -3776,9 +4028,11 @@ void wxGrid::InitRowHeights() m_rowBottoms.Alloc( m_numRows ); int rowBottom = 0; + + m_rowHeights.Add( m_defaultRowHeight, m_numRows ); + for ( int i = 0; i < m_numRows; i++ ) { - m_rowHeights.Add( m_defaultRowHeight ); rowBottom += m_defaultRowHeight; m_rowBottoms.Add( rowBottom ); } @@ -3792,9 +4046,11 @@ void wxGrid::InitColWidths() m_colWidths.Alloc( m_numCols ); m_colRights.Alloc( m_numCols ); int colRight = 0; + + m_colWidths.Add( m_defaultColWidth, m_numCols ); + for ( int i = 0; i < m_numCols; i++ ) { - m_colWidths.Add( m_defaultColWidth ); colRight += m_defaultColWidth; m_colRights.Add( colRight ); } @@ -3848,6 +4104,27 @@ void wxGrid::CalcDimensions() int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0; int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0; + // take into account editor if shown + if( IsCellEditControlShown() ) + { + int w2, h2; + int r = m_currentCellCoords.GetRow(); + int c = m_currentCellCoords.GetCol(); + int x = GetColLeft(c); + int y = GetRowTop(r); + + // how big is the editor + wxGridCellAttr* attr = GetCellAttr(r, c); + wxGridCellEditor* editor = attr->GetEditor(this, r, c); + editor->GetControl()->GetSize(&w2, &h2); + w2 += x; + h2 += y; + if( w2 > w ) w = w2; + if( h2 > h ) h = h2; + editor->DecRef(); + attr->DecRef(); + } + // preserve (more or less) the previous position int x, y; GetViewStart( &x, &y ); @@ -3913,6 +4190,15 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) int i; bool result = FALSE; + // Clear the attribute cache as the attribute might refer to a different + // cell than stored in the cache after adding/removing rows/columns. + ClearAttrCache(); + // By the same reasoning, the editor should be dismissed if columns are + // added or removed. And for consistency, it should IMHO always be + // 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. + HideCellEditControl(); #if 0 // if we were using the default widths/heights so far, we must change them // now @@ -3938,11 +4224,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( !m_rowHeights.IsEmpty() ) { - for ( i = 0; i < numRows; i++ ) - { - m_rowHeights.Insert( m_defaultRowHeight, pos ); - m_rowBottoms.Insert( 0, pos ); - } + m_rowHeights.Insert( m_defaultRowHeight, pos, numRows ); + m_rowBottoms.Insert( 0, pos, numRows ); int bottom = 0; if ( pos > 0 ) bottom = m_rowBottoms[pos-1]; @@ -3960,7 +4243,9 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) // SetCurrentCell( 0, 0 ); } - m_selection->UpdateRows( pos, numRows ); + + if ( m_selection ) + m_selection->UpdateRows( pos, numRows ); wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); if (attrProvider) attrProvider->UpdateAttrRows( pos, numRows ); @@ -3982,11 +4267,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( !m_rowHeights.IsEmpty() ) { - for ( i = 0; i < numRows; i++ ) - { - m_rowHeights.Add( m_defaultRowHeight ); - m_rowBottoms.Add( 0 ); - } + m_rowHeights.Add( m_defaultRowHeight, numRows ); + m_rowBottoms.Add( 0, numRows ); int bottom = 0; if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1]; @@ -4021,11 +4303,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( !m_rowHeights.IsEmpty() ) { - for ( i = 0; i < numRows; i++ ) - { - m_rowHeights.RemoveAt( pos ); - m_rowBottoms.RemoveAt( pos ); - } + m_rowHeights.RemoveAt( pos, numRows ); + m_rowBottoms.RemoveAt( pos, numRows ); int h = 0; for ( i = 0; i < m_numRows; i++ ) @@ -4043,7 +4322,9 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( m_currentCellCoords.GetRow() >= m_numRows ) m_currentCellCoords.Set( 0, 0 ); } - m_selection->UpdateRows( pos, -((int)numRows) ); + + if ( m_selection ) + m_selection->UpdateRows( pos, -((int)numRows) ); wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); if (attrProvider) { attrProvider->UpdateAttrRows( pos, -((int)numRows) ); @@ -4075,11 +4356,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( !m_colWidths.IsEmpty() ) { - for ( i = 0; i < numCols; i++ ) - { - m_colWidths.Insert( m_defaultColWidth, pos ); - m_colRights.Insert( 0, pos ); - } + m_colWidths.Insert( m_defaultColWidth, pos, numCols ); + m_colRights.Insert( 0, pos, numCols ); int right = 0; if ( pos > 0 ) right = m_colRights[pos-1]; @@ -4097,7 +4375,9 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) // SetCurrentCell( 0, 0 ); } - m_selection->UpdateCols( pos, numCols ); + + if ( m_selection ) + m_selection->UpdateCols( pos, numCols ); wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); if (attrProvider) attrProvider->UpdateAttrCols( pos, numCols ); @@ -4118,11 +4398,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_numCols += numCols; if ( !m_colWidths.IsEmpty() ) { - for ( i = 0; i < numCols; i++ ) - { - m_colWidths.Add( m_defaultColWidth ); - m_colRights.Add( 0 ); - } + m_colWidths.Add( m_defaultColWidth, numCols ); + m_colRights.Add( 0, numCols ); int right = 0; if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1]; @@ -4157,11 +4434,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( !m_colWidths.IsEmpty() ) { - for ( i = 0; i < numCols; i++ ) - { - m_colWidths.RemoveAt( pos ); - m_colRights.RemoveAt( pos ); - } + m_colWidths.RemoveAt( pos, numCols ); + m_colRights.RemoveAt( pos, numCols ); int w = 0; for ( i = 0; i < m_numCols; i++ ) @@ -4179,7 +4453,9 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) if ( m_currentCellCoords.GetCol() >= m_numCols ) m_currentCellCoords.Set( 0, 0 ); } - m_selection->UpdateCols( pos, -((int)numCols) ); + + if ( m_selection ) + m_selection->UpdateCols( pos, -((int)numCols) ); wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); if (attrProvider) { attrProvider->UpdateAttrCols( pos, -((int)numCols) ); @@ -4243,7 +4519,7 @@ wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) // find the row labels within these bounds // int row; - for ( row = YToRow(top); row < m_numRows; row++ ) + for ( row = internalYToRow(top); row < m_numRows; row++ ) { if ( GetRowBottom(row) < top ) continue; @@ -4294,7 +4570,7 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) // find the cells within these bounds // int col; - for ( col = XToCol(left); col < m_numCols; col++ ) + for ( col = internalXToCol(left); col < m_numCols; col++ ) { if ( GetColRight(col) < left ) continue; @@ -4345,7 +4621,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) // find the cells within these bounds // int row, col; - for ( row = YToRow(top); row < m_numRows; row++ ) + for ( row = internalYToRow(top); row < m_numRows; row++ ) { if ( GetRowBottom(row) <= top ) continue; @@ -4353,7 +4629,7 @@ wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) if ( GetRowTop(row) > bottom ) break; - for ( col = XToCol(left); col < m_numCols; col++ ) + for ( col = internalXToCol(left); col < m_numCols; col++ ) { if ( GetColRight(col) <= left ) continue; @@ -4380,7 +4656,11 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if ( event.Dragging() ) { - m_isDragging = TRUE; + if (!m_isDragging) + { + m_isDragging = TRUE; + m_rowLabelWin->CaptureMouse(); + } if ( event.LeftIsDown() ) { @@ -4410,11 +4690,14 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) case WXGRID_CURSOR_SELECT_ROW: if ( (row = YToRow( y )) >= 0 ) { - m_selection->SelectRow( row, - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + if ( m_selection ) + { + m_selection->SelectRow( row, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } } // default label to suppress warnings about "enumeration value @@ -4426,8 +4709,14 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) return; } - m_isDragging = FALSE; + if ( m_isDragging && (event.Entering() || event.Leaving()) ) + return; + if (m_isDragging) + { + if (m_rowLabelWin->HasCapture()) m_rowLabelWin->ReleaseMouse(); + m_isDragging = FALSE; + } // ------------ Entering or leaving the window // @@ -4453,21 +4742,29 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { if ( !event.ShiftDown() && !event.ControlDown() ) ClearSelection(); - if ( event.ShiftDown() ) - m_selection->SelectBlock( m_currentCellCoords.GetRow(), - 0, - row, - GetNumberCols() - 1, - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); - else - m_selection->SelectRow( row, - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + if ( m_selection ) + { + if ( event.ShiftDown() ) + { + m_selection->SelectBlock( m_currentCellCoords.GetRow(), + 0, + row, + GetNumberCols() - 1, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } + else + { + m_selection->SelectRow( row, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } + } + ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin); } } @@ -4566,7 +4863,11 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if ( event.Dragging() ) { - m_isDragging = TRUE; + if (!m_isDragging) + { + m_isDragging = TRUE; + m_colLabelWin->CaptureMouse(); + } if ( event.LeftIsDown() ) { @@ -4596,11 +4897,14 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) case WXGRID_CURSOR_SELECT_COL: if ( (col = XToCol( x )) >= 0 ) { - m_selection->SelectCol( col, - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + if ( m_selection ) + { + m_selection->SelectCol( col, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } } // default label to suppress warnings about "enumeration value @@ -4612,8 +4916,14 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) return; } - m_isDragging = FALSE; + if ( m_isDragging && (event.Entering() || event.Leaving()) ) + return; + if (m_isDragging) + { + if (m_colLabelWin->HasCapture()) m_colLabelWin->ReleaseMouse(); + m_isDragging = FALSE; + } // ------------ Entering or leaving the window // @@ -4639,20 +4949,28 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { if ( !event.ShiftDown() && !event.ControlDown() ) ClearSelection(); - if ( event.ShiftDown() ) - m_selection->SelectBlock( 0, - m_currentCellCoords.GetCol(), - GetNumberRows() - 1, col, - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); - else - m_selection->SelectCol( col, - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + if ( m_selection ) + { + if ( event.ShiftDown() ) + { + m_selection->SelectBlock( 0, + m_currentCellCoords.GetCol(), + GetNumberRows() - 1, col, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } + else + { + m_selection->SelectCol( col, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } + } + ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin); } } @@ -4813,7 +5131,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode, if ( m_winCapture ) { - m_winCapture->ReleaseMouse(); + if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse(); m_winCapture = (wxWindow *)NULL; } @@ -4853,6 +5171,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) wxGridCellCoords coords; XYToCell( x, y, coords ); + int cell_rows, cell_cols; + GetCellSize( coords.GetRow(), coords.GetCol(), &cell_rows, &cell_cols ); + if ((cell_rows < 0) || (cell_cols < 0)) + { + coords.SetRow(coords.GetRow() + cell_rows); + coords.SetCol(coords.GetCol() + cell_cols); + } + if ( event.Dragging() ) { //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol()); @@ -4984,14 +5310,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) ClearSelection(); if ( event.ShiftDown() ) { - m_selection->SelectBlock( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol(), - coords.GetRow(), - coords.GetCol(), - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + if ( m_selection ) + { + m_selection->SelectBlock( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol(), + coords.GetRow(), + coords.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } } else if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) @@ -4999,27 +5328,9 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) DisableCellEditControl(); MakeCellVisible( coords ); - // if this is the second click on this cell then start - // the edit control - if ( m_waitForSlowClick && - (coords == m_currentCellCoords) && - CanEnableCellControl()) + if ( event.ControlDown() ) { - EnableCellEditControl(); - - wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); - wxGridCellEditor *editor = attr->GetEditor(this, - coords.GetRow(), - coords.GetCol()); - editor->StartingClick(); - editor->DecRef(); - attr->DecRef(); - - m_waitForSlowClick = FALSE; - } - else - { - if ( event.ControlDown() ) + if ( m_selection ) { m_selection->ToggleCellSelection( coords.GetRow(), coords.GetCol(), @@ -5027,18 +5338,23 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) event.ShiftDown(), event.AltDown(), event.MetaDown() ); - m_selectingTopLeft = wxGridNoCellCoords; - m_selectingBottomRight = wxGridNoCellCoords; - m_selectingKeyboard = coords; } - else + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; + m_selectingKeyboard = coords; + } + else + { + m_waitForSlowClick = m_currentCellCoords == coords && coords != wxGridNoCellCoords; + SetCurrentCell( coords ); + if ( m_selection ) { - SetCurrentCell( coords ); - if ( m_selection->GetSelectionMode() - != wxGrid::wxGridSelectCells) + if ( m_selection->GetSelectionMode() != + wxGrid::wxGridSelectCells ) + { HighlightBlock( coords, coords ); + } } - m_waitForSlowClick = TRUE; } } } @@ -5072,24 +5388,44 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if (m_winCapture) { - m_winCapture->ReleaseMouse(); + if (m_winCapture->HasCapture()) m_winCapture->ReleaseMouse(); m_winCapture = NULL; } - m_selection->SelectBlock( m_selectingTopLeft.GetRow(), - m_selectingTopLeft.GetCol(), - m_selectingBottomRight.GetRow(), - m_selectingBottomRight.GetCol(), - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + + if ( m_selection ) + { + m_selection->SelectBlock( m_selectingTopLeft.GetRow(), + m_selectingTopLeft.GetCol(), + m_selectingBottomRight.GetRow(), + m_selectingBottomRight.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } + m_selectingTopLeft = wxGridNoCellCoords; m_selectingBottomRight = wxGridNoCellCoords; - } - // Show the edit control, if it has been hidden for - // drag-shrinking. - ShowCellEditControl(); + // Show the edit control, if it has been hidden for + // drag-shrinking. + ShowCellEditControl(); + } + else + { + if( m_waitForSlowClick && CanEnableCellControl()) + { + EnableCellEditControl(); + + wxGridCellAttr* attr = GetCellAttr(coords); + wxGridCellEditor *editor = attr->GetEditor(this, coords.GetRow(), coords.GetCol()); + editor->StartingClick(); + editor->DecRef(); + attr->DecRef(); + + m_waitForSlowClick = FALSE; + } + } } else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) { @@ -5149,6 +5485,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.Moving() && !event.IsButton() ) { + if( coords.GetRow() < 0 || coords.GetCol() < 0 ) + { + // out of grid cell area + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + return; + } + int dragRow = YToEdgeOfRow( y ); int dragCol = XToEdgeOfCol( x ); @@ -5233,6 +5576,26 @@ void wxGrid::DoEndDragResizeRow() rect.height = ch - rect.y; m_rowLabelWin->Refresh( TRUE, &rect ); rect.width = cw; + // if there is a multicell block, paint all of it + if (m_table) + { + int i, cell_rows, cell_cols, subtract_rows = 0; + int leftCol = XToCol(left); + int rightCol = XToCol(left+cw); + if (leftCol >= 0) + { + if (rightCol < 0) rightCol = m_numCols; + for (i=leftCol; iRefresh( FALSE, &rect ); } @@ -5273,6 +5636,26 @@ void wxGrid::DoEndDragResizeCol() rect.height = m_colLabelHeight; m_colLabelWin->Refresh( TRUE, &rect ); rect.height = ch; + // if there is a multicell block, paint all of it + if (m_table) + { + int i, cell_rows, cell_cols, subtract_cols = 0; + int topRow = YToRow(top); + int bottomRow = YToRow(top+cw); + if (topRow >= 0) + { + if (bottomRow < 0) bottomRow = m_numRows; + for (i=topRow; iRefresh( FALSE, &rect ); } @@ -5569,6 +5952,92 @@ void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW } +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); + + 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.. + rect_x = rect->GetX(); + rect_y = rect->GetY(); + rectWidth = rect->GetWidth(); + rectHeight = rect->GetHeight(); + + width_label = m_rowLabelWidth - rect_x; + if (width_label > rectWidth) width_label = rectWidth; + + height_label = m_colLabelHeight - rect_y; + if (height_label > rectHeight) height_label = rectHeight; + + 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); + } + } +} void wxGrid::OnSize( wxSizeEvent& event ) { @@ -5738,12 +6207,15 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) case WXK_SPACE: if ( event.ControlDown() ) { - m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol(), - event.ControlDown(), - event.ShiftDown(), - event.AltDown(), - event.MetaDown() ); + if ( m_selection ) + { + m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + } break; } if ( !IsEditable() ) @@ -5768,15 +6240,15 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers()) || editor->IsAcceptedKey(event) ) { + // ensure cell is visble + MakeCellVisible(row, col); EnableCellEditControl(); - // the editor could be not shown for a variety of - // reasons (i.e. blocked by the app or whatever), so - // check if it really was created - if ( m_cellEditCtrlEnabled ) - { - editor->StartingKey(event); - } + // a problem can arise if the cell is not completely + // visible (even after calling MakeCellVisible the + // control is not created and calling StartingKey will + // crash the app + if( editor->IsCreated() && m_cellEditCtrlEnabled ) editor->StartingKey(event); } else { @@ -5807,14 +6279,20 @@ void wxGrid::OnKeyUp( wxKeyEvent& event ) { if ( m_selectingTopLeft != wxGridNoCellCoords && m_selectingBottomRight != wxGridNoCellCoords ) - m_selection->SelectBlock( m_selectingTopLeft.GetRow(), - m_selectingTopLeft.GetCol(), - m_selectingBottomRight.GetRow(), - m_selectingBottomRight.GetCol(), - event.ControlDown(), - TRUE, - event.AltDown(), - event.MetaDown() ); + { + if ( m_selection ) + { + m_selection->SelectBlock( m_selectingTopLeft.GetRow(), + m_selectingTopLeft.GetCol(), + m_selectingBottomRight.GetRow(), + m_selectingBottomRight.GetCol(), + event.ControlDown(), + TRUE, + event.AltDown(), + event.MetaDown() ); + } + } + m_selectingTopLeft = wxGridNoCellCoords; m_selectingBottomRight = wxGridNoCellCoords; m_selectingKeyboard = wxGridNoCellCoords; @@ -5844,7 +6322,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) if ( IsVisible( m_currentCellCoords, FALSE ) ) { wxRect r; - r = BlockToDeviceRect(m_currentCellCoords, coords); + r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); if ( !m_gridLinesEnabled ) { r.x--; @@ -5853,7 +6331,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) r.height++; } - wxGridCellCoordsArray cells = CalcCellsExposed( r ); + wxGridCellCoordsArray cells = CalcCellsExposed( r ); // Otherwise refresh redraws the highlight! m_currentCellCoords = coords; @@ -5876,16 +6354,20 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo int temp; wxGridCellCoords updateTopLeft, updateBottomRight; - if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) + if ( m_selection ) { - leftCol = 0; - rightCol = GetNumberCols() - 1; - } - else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) - { - topRow = 0; - bottomRow = GetNumberRows() - 1; + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) + { + leftCol = 0; + rightCol = GetNumberCols() - 1; + } + else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) + { + topRow = 0; + bottomRow = GetNumberRows() - 1; + } } + if ( topRow > bottomRow ) { temp = topRow; @@ -5903,8 +6385,18 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo updateTopLeft = wxGridCellCoords( topRow, leftCol ); updateBottomRight = wxGridCellCoords( bottomRow, rightCol ); - if ( m_selectingTopLeft != updateTopLeft || - m_selectingBottomRight != updateBottomRight ) + // First the case that we selected a completely new area + if ( m_selectingTopLeft == wxGridNoCellCoords || + m_selectingBottomRight == wxGridNoCellCoords ) + { + wxRect rect; + rect = BlockToDeviceRect( wxGridCellCoords ( topRow, leftCol ), + wxGridCellCoords ( bottomRow, rightCol ) ); + m_gridWin->Refresh( FALSE, &rect ); + } + // Now handle changing an existing selection area. + else if ( m_selectingTopLeft != updateTopLeft || + m_selectingBottomRight != updateBottomRight ) { // Compute two optimal update rectangles: // Either one rectangle is a real subset of the @@ -5955,6 +6447,8 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo if ( oldLeft < leftCol ) { + // Refresh the newly selected or deselected + // area to the left of the old or new selection. need_refresh[0] = TRUE; rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, oldLeft ), @@ -5964,6 +6458,8 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo if ( oldTop < topRow ) { + // Refresh the newly selected or deselected + // area above the old or new selection. need_refresh[1] = TRUE; rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, leftCol ), @@ -5973,6 +6469,8 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo if ( oldRight > rightCol ) { + // Refresh the newly selected or deselected + // area to the right of the old or new selection. need_refresh[2] = TRUE; rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop, rightCol + 1 ), @@ -5982,6 +6480,8 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo if ( oldBottom > bottomRow ) { + // Refresh the newly selected or deselected + // area below the old or new selection. need_refresh[3] = TRUE; rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1, leftCol ), @@ -5989,20 +6489,14 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo rightCol ) ); } - - // Change Selection - m_selectingTopLeft = updateTopLeft; - m_selectingBottomRight = updateBottomRight; - // various Refresh() calls for (i = 0; i < 4; i++ ) if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &(rect[i]) ); } - - // never generate an event as it will be generated from - // wxGridSelection::SelectBlock! - // (old comment from when this was the body of SelectBlock) + // Change Selection + m_selectingTopLeft = updateTopLeft; + m_selectingBottomRight = updateBottomRight; } // @@ -6011,6 +6505,9 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo 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 @@ -6027,6 +6524,11 @@ bool wxGrid::SetModelValues() { 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++ ) @@ -6053,13 +6555,104 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( !m_numRows || !m_numCols ) return; - size_t i; - size_t numCells = cells.GetCount(); + int i, numCells = cells.GetCount(); + int row, col, cell_rows, cell_cols; + wxGridCellCoordsArray redrawCells; - for ( i = 0; i < numCells; i++ ) + for ( i = numCells-1; i >= 0; i-- ) { + row = cells[i].GetRow(); + col = cells[i].GetCol(); + GetCellSize( row, col, &cell_rows, &cell_cols ); + + // If this cell is part of a multicell block, find owner for repaint + if ( cell_rows <= 0 || cell_cols <= 0 ) + { + wxGridCellCoords cell(row+cell_rows, col+cell_cols); + bool marked = FALSE; + for ( int j = 0; j < numCells; j++ ) + { + if ( cell == cells[j] ) + { + marked = TRUE; + break; + } + } + if (!marked) + { + int count = redrawCells.GetCount(); + for (int j = 0; j < count; j++) + { + if ( cell == redrawCells[j] ) + { + marked = TRUE; + break; + } + } + if (!marked) redrawCells.Add( cell ); + } + continue; // don't bother drawing this cell + } + + // If this cell is empty, find cell to left that might want to overflow + if (m_table && m_table->IsEmptyCell(row, col)) + { + for ( int l = 0; l < cell_rows; l++ ) + { + // find a cell in this row to left alreay marked for repaint + int left = col; + for (int k = 0; k < int(redrawCells.GetCount()); k++) + if ((redrawCells[k].GetCol() < left) && + (redrawCells[k].GetRow() == row)) + left=redrawCells[k].GetCol(); + + if (left == col) left = 0; // oh well + + for (int j = col-1; j >= left; j--) + { + if (!m_table->IsEmptyCell(row+l, j)) + { + if (GetCellOverflow(row+l, j)) + { + wxGridCellCoords cell(row+l, j); + bool marked = FALSE; + + for (int k = 0; k < numCells; k++) + { + if ( cell == cells[k] ) + { + marked = TRUE; + break; + } + } + if (!marked) + { + int count = redrawCells.GetCount(); + for (int k = 0; k < count; k++) + { + if ( cell == redrawCells[k] ) + { + marked = TRUE; + break; + } + } + if (!marked) redrawCells.Add( cell ); + } + } + break; + } + } + } + } DrawCell( dc, cells[i] ); } + + numCells = redrawCells.GetCount(); + + for ( i = numCells - 1; i >= 0; i-- ) + { + DrawCell( dc, redrawCells[i] ); + } } @@ -6151,8 +6744,8 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth; - if (penWidth > 0) { - + if (penWidth > 0) + { // The center of th drawn line is where the position/width/height of // the rectangle is actually at, (on wxMSW atr least,) so we will // reduce the size of the rectangle to compensate for the thickness of @@ -6165,7 +6758,9 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) // Now draw the rectangle - dc.SetPen(wxPen(m_cellHighlightColour, penWidth, wxSOLID)); + // use the cellHighlightColour if the cell is inside a selection, this + // will ensure the cell is always visible. + dc.SetPen(wxPen(IsInSelection(row,col)?m_selectionForeground:m_cellHighlightColour, penWidth, wxSOLID)); dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRectangle(rect); } @@ -6202,15 +6797,17 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); + wxRect rect = CellToRect( row, col ); + // right hand border // - dc.DrawLine( GetColRight(col), GetRowTop(row), - GetColRight(col), GetRowBottom(row) ); + dc.DrawLine( rect.x + rect.width, rect.y, + rect.x + rect.width, rect.y + rect.height + 1 ); // bottom border // - dc.DrawLine( GetColLeft(col), GetRowBottom(row), - GetColRight(col), GetRowBottom(row) ); + dc.DrawLine( rect.x, rect.y + rect.height, + rect.x + rect.width, rect.y + rect.height); } void wxGrid::DrawHighlight(wxDC& dc,const wxGridCellCoordsArray& cells) @@ -6252,6 +6849,10 @@ void wxGrid::DrawHighlight(wxDC& dc,const wxGridCellCoordsArray& cells) // void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) { +#if !WXGRID_DRAW_LINES + return; +#endif + if ( !m_gridLinesEnabled || !m_numRows || !m_numCols ) return; @@ -6288,12 +6889,49 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) right = wxMin( right, GetColRight(m_numCols - 1) ); bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) ); + // no gridlines inside multicells, clip them out + int leftCol = XToCol(left); + int topRow = YToRow(top); + int rightCol = XToCol(right); + int bottomRow = YToRow(bottom); + wxRegion clippedcells(0, 0, cw, ch); + + if ((leftCol >= 0) && (topRow >= 0)) + { + if (rightCol < 0) rightCol = m_numCols; + if (bottomRow < 0) bottomRow = m_numRows; + + int i, j, cell_rows, cell_cols; + wxRect rect; + + for (j=topRow; j 1) || (cell_cols > 1)) + { + rect = CellToRect(j,i); + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + clippedcells.Subtract(rect); + } + else if ((cell_rows < 0) || (cell_cols < 0)) + { + rect = CellToRect(j+cell_rows, i+cell_cols); + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + clippedcells.Subtract(rect); + } + } + } + } + dc.SetClippingRegion( clippedcells ); + dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); // horizontal grid lines // int i; - for ( i = YToRow(top); i < m_numRows; i++ ) + for ( i = internalYToRow(top); i < m_numRows; i++ ) { int bot = GetRowBottom(i) - 1; @@ -6311,7 +6949,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) // vertical grid lines // - for ( i = XToCol(left); i < m_numCols; i++ ) + for ( i = internalXToCol(left); i < m_numCols; i++ ) { int colRight = GetColRight(i) - 1; if ( colRight > right ) @@ -6324,6 +6962,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) dc.DrawLine( colRight, top, colRight, bottom ); } } + dc.DestroyClippingRegion(); } @@ -6349,15 +6988,17 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) int rowTop = GetRowTop(row), rowBottom = GetRowBottom(row) - 1; - dc.SetPen( *wxBLACK_PEN ); + dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) ); dc.DrawLine( m_rowLabelWidth-1, rowTop, m_rowLabelWidth-1, rowBottom ); - dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom ); + dc.DrawLine( 0, rowTop, 0, rowBottom ); + + dc.DrawLine( 0, rowBottom, m_rowLabelWidth, rowBottom ); dc.SetPen( *wxWHITE_PEN ); - dc.DrawLine( 0, rowTop, 0, rowBottom ); - dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop ); + dc.DrawLine( 1, rowTop, 1, rowBottom ); + dc.DrawLine( 1, rowTop, m_rowLabelWidth-1, rowTop ); dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); @@ -6397,16 +7038,18 @@ void wxGrid::DrawColLabel( wxDC& dc, int col ) int colLeft = GetColLeft(col), colRight = GetColRight(col) - 1; - dc.SetPen( *wxBLACK_PEN ); + dc.SetPen( wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW),1, wxSOLID) ); dc.DrawLine( colRight, 0, colRight, m_colLabelHeight-1 ); + dc.DrawLine( colLeft, 0, colRight, 0 ); + dc.DrawLine( colLeft, m_colLabelHeight-1, - colRight, m_colLabelHeight-1 ); + colRight+1, m_colLabelHeight-1 ); dc.SetPen( *wxWHITE_PEN ); - dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 ); - dc.DrawLine( colLeft, 0, colRight, 0 ); + dc.DrawLine( colLeft, 1, colLeft, m_colLabelHeight-1 ); + dc.DrawLine( colLeft, 1, colRight, 1 ); dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); @@ -6435,7 +7078,6 @@ void wxGrid::DrawTextRectangle( wxDC& dc, { wxArrayString lines; - dc.SetClippingRegion( rect ); StringToLines( value, lines ); @@ -6456,52 +7098,57 @@ void wxGrid::DrawTextRectangle( wxDC& dc, { long textWidth, textHeight; long lineWidth, lineHeight; + int nLines; + + dc.SetClippingRegion( rect ); - if ( lines.GetCount() ) + nLines = lines.GetCount(); + if( nLines > 0 ) { - GetTextBoxSize( dc, lines, &textWidth, &textHeight ); - dc.GetTextExtent( lines[0], &lineWidth, &lineHeight ); + int l; + float x, y; + GetTextBoxSize(dc, lines, &textWidth, &textHeight); + switch( vertAlign ) + { + case wxALIGN_BOTTOM: + y = rect.y + (rect.height - textHeight - 1); + break; - float x, y; - switch ( horizAlign ) - { - case wxALIGN_RIGHT: - x = rect.x + (rect.width - textWidth - 1); - break; + case wxALIGN_CENTRE: + y = rect.y + ((rect.height - textHeight)/2); + break; - case wxALIGN_CENTRE: - x = rect.x + ((rect.width - textWidth)/2); - break; + case wxALIGN_TOP: + default: + y = rect.y + 1; + break; + } - case wxALIGN_LEFT: - default: - x = rect.x + 1; - break; - } + // Align each line of a multi-line label + for( l = 0; l < nLines; l++ ) + { + dc.GetTextExtent(lines[l], &lineWidth, &lineHeight); - switch ( vertAlign ) + switch( horizAlign ) { - case wxALIGN_BOTTOM: - y = rect.y + (rect.height - textHeight - 1); - break; + case wxALIGN_RIGHT: + x = rect.x + (rect.width - lineWidth - 1); + break; - case wxALIGN_CENTRE: - y = rect.y + ((rect.height - textHeight)/2); - break; + case wxALIGN_CENTRE: + x = rect.x + ((rect.width - lineWidth)/2); + break; - case wxALIGN_TOP: - default: - y = rect.y + 1; - break; + case wxALIGN_LEFT: + default: + x = rect.x + 1; + break; } - for ( size_t i = 0; i < lines.GetCount(); i++ ) - { - dc.DrawText( lines[i], (int)x, (int)y ); - y += lineHeight; - } + dc.DrawText( lines[l], (int)x, (int)y ); + y += lineHeight; + } } - dc.DestroyClippingRegion(); } @@ -6708,6 +7355,17 @@ void wxGrid::ShowCellEditControl() int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); + // if this is part of a multicell, find owner (topleft) + int cell_rows, cell_cols; + GetCellSize( row, col, &cell_rows, &cell_cols ); + if ( cell_rows <= 0 || cell_cols <= 0 ) + { + row += cell_rows; + col += cell_cols; + m_currentCellCoords.SetRow( row ); + m_currentCellCoords.SetCol( col ); + } + // convert to scrolled coords // CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); @@ -6724,8 +7382,13 @@ void wxGrid::ShowCellEditControl() #endif // 0 // cell is shifted by one pixel - rect.x--; - rect.y--; + // However, don't allow x or y to become negative + // since the SetSize() method interprets that as + // "don't change." + if (rect.x > 0) + rect.x--; + if (rect.y > 0) + rect.y--; wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col); @@ -6743,15 +7406,54 @@ void wxGrid::ShowCellEditControl() GetEventHandler()->ProcessEvent(evt); } - editor->Show( TRUE, attr ); + // resize editor to overflow into righthand cells if allowed + int maxWidth = rect.width; + wxString value = GetCellValue(row, col); + if ( (value != wxEmptyString) && (attr->GetOverflow()) ) + { + int y; + GetTextExtent(value, &maxWidth, &y, + NULL, NULL, &attr->GetFont()); + if (maxWidth < rect.width) maxWidth = rect.width; + } + int client_right = m_gridWin->GetClientSize().GetWidth(); + if (rect.x+maxWidth > client_right) + maxWidth = client_right - rect.x; + + if ((maxWidth > rect.width) && (col < m_numCols) && m_table) + { + GetCellSize( row, col, &cell_rows, &cell_cols ); + // may have changed earlier + for (int i = col+cell_cols; i < m_numCols; i++) + { + int c_rows, c_cols; + GetCellSize( row, i, &c_rows, &c_cols ); + // looks weird going over a multicell + if (m_table->IsEmptyCell(row,i) && + (rect.width < maxWidth) && (c_rows == 1)) + rect.width += GetColWidth(i); + else + break; + } + if (rect.GetRight() > client_right) + rect.SetRight(client_right-1); + } + + editor->SetCellAttr(attr); editor->SetSize( rect ); + editor->Show( TRUE, attr ); + + // recalc dimensions in case we need to + // expand the scrolled window to account for editor + CalcDimensions(); editor->BeginEdit(row, col, this); + editor->SetCellAttr(NULL); editor->DecRef(); attr->DecRef(); - } + } } } @@ -6769,7 +7471,10 @@ void wxGrid::HideCellEditControl() editor->DecRef(); attr->DecRef(); m_gridWin->SetFocus(); - wxRect rect( CellToRect( row, col ) ); + // refresh whole row to the right + wxRect rect( CellToRect(row, col) ); + CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y ); + rect.width = m_gridWin->GetClientSize().GetWidth() - rect.x; m_gridWin->Refresh( FALSE, &rect ); } } @@ -6830,24 +7535,28 @@ void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) // Internal Helper function for computing row or column from some // (unscrolled) coordinate value, using either -// m_defaultRowHeight/m_defaultColWidth or binary search on array +// m_defaultRowHeight/m_defaultColWidth or binary search on array // of m_rowBottoms/m_ColRights to speed up the search! static int CoordToRowOrCol(int coord, int defaultDist, int minDist, - wxArrayInt BorderArray) + const wxArrayInt& BorderArray, int nMax, + bool maxOnOverflow) { if (!defaultDist) defaultDist = 1; - unsigned int i_max = coord / defaultDist, - i_min = 0; + size_t i_max = coord / defaultDist, + i_min = 0; + if (BorderArray.IsEmpty()) { - return i_max; + if((int) i_max < nMax) + return i_max; + return maxOnOverflow ? nMax - 1 : -1; } if ( i_max >= BorderArray.GetCount()) i_max = BorderArray.GetCount() - 1; - else + else { if ( coord >= BorderArray[i_max]) { @@ -6857,17 +7566,17 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, if ( i_max >= BorderArray.GetCount()) i_max = BorderArray.GetCount() - 1; } - if ( coord > BorderArray[i_max]) - return -1; + if ( coord >= BorderArray[i_max]) + return maxOnOverflow ? (int)i_max : -1; + if ( coord < BorderArray[0] ) + return 0; - while ( i_max - i_min > 1 ) + while ( i_max - i_min > 0 ) { wxCHECK_MSG(BorderArray[i_min] <= coord && coord < BorderArray[i_max], - -1, _T("wxGrid: internal error in CoordToRowOrCol")); + 0, _T("wxGrid: internal error in CoordToRowOrCol")); if (coord >= BorderArray[ i_max - 1]) - { return i_max; - } else i_max--; int median = i_min + (i_max - i_min + 1) / 2; @@ -6882,14 +7591,14 @@ static int CoordToRowOrCol(int coord, int defaultDist, int minDist, int wxGrid::YToRow( int y ) { return CoordToRowOrCol(y, m_defaultRowHeight, - WXGRID_MIN_ROW_HEIGHT, m_rowBottoms); + WXGRID_MIN_ROW_HEIGHT, m_rowBottoms, m_numRows, FALSE); } int wxGrid::XToCol( int x ) { return CoordToRowOrCol(x, m_defaultColWidth, - WXGRID_MIN_COL_WIDTH, m_colRights); + WXGRID_MIN_COL_WIDTH, m_colRights, m_numCols, FALSE); } @@ -6898,16 +7607,17 @@ int wxGrid::XToCol( int x ) // int wxGrid::YToEdgeOfRow( int y ) { - int i, d; + int i; + i = internalYToRow(y); - for ( i = YToRow( y ) - 1; i < m_numRows; i++ ) + if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE ) { - if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE ) - { - d = abs( y - GetRowBottom(i) ); - if ( d < WXGRID_LABEL_EDGE_ZONE ) - return i; - } + // We know that we are in row i, test whether we are + // close enough to lower or upper border, respectively. + if ( abs(GetRowBottom(i) - y) < WXGRID_LABEL_EDGE_ZONE ) + return i; + else if( i > 0 && y - GetRowTop(i) < WXGRID_LABEL_EDGE_ZONE ) + return i - 1; } return -1; @@ -6919,16 +7629,17 @@ int wxGrid::YToEdgeOfRow( int y ) // int wxGrid::XToEdgeOfCol( int x ) { - int i, d; + int i; + i = internalXToCol(x); - for (i = XToCol( x ) - 1; i < m_numCols; i++ ) + if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE ) { - if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE ) - { - d = abs( x - GetColRight(i) ); - if ( d < WXGRID_LABEL_EDGE_ZONE ) - return i; - } + // We know that we are in column i, test whether we are + // close enough to right or left border, respectively. + if ( abs(GetColRight(i) - x) < WXGRID_LABEL_EDGE_ZONE ) + return i; + else if( i > 0 && x - GetColLeft(i) < WXGRID_LABEL_EDGE_ZONE ) + return i - 1; } return -1; @@ -6942,10 +7653,20 @@ wxRect wxGrid::CellToRect( int row, int col ) if ( row >= 0 && row < m_numRows && col >= 0 && col < m_numCols ) { + int i, cell_rows, cell_cols; + rect.width = rect.height = 0; + GetCellSize( row, col, &cell_rows, &cell_cols ); + // if negative then find multicell owner + if (cell_rows < 0) row += cell_rows; + if (cell_cols < 0) col += cell_cols; + GetCellSize( row, col, &cell_rows, &cell_cols ); + rect.x = GetColLeft(col); rect.y = GetRowTop(row); - rect.width = GetColWidth(col); - rect.height = GetRowHeight(row); + for (i=col; i cw ) { - int w = r.GetWidth(); - xpos = r.GetLeft(); - for ( i = col-1; i >= 0; i-- ) - { - int colWidth = GetColWidth(i); - if ( w + colWidth > cw ) - break; - - w += colWidth; - xpos -= colWidth; - } + // position the view so that the cell is on the right + int x0, y0; + CalcUnscrolledPosition(0, 0, &x0, &y0); + xpos = x0 + (right - cw); // see comment for ypos above xpos += GRID_SCROLL_LINE_X; @@ -7598,7 +8312,7 @@ void wxGrid::SetRowLabelSize( int width ) m_rowLabelWidth = width; CalcWindowSizes(); - Refresh( TRUE ); + wxScrolledWindow::Refresh( TRUE ); } } @@ -7621,7 +8335,7 @@ void wxGrid::SetColLabelSize( int height ) m_colLabelHeight = height; CalcWindowSizes(); - Refresh( TRUE ); + wxScrolledWindow::Refresh( TRUE ); } } @@ -7904,6 +8618,11 @@ void wxGrid::SetDefaultCellAlignment( int horiz, int vert ) m_defaultCellAttr->SetAlignment(horiz, vert); } +void wxGrid::SetDefaultCellOverflow( bool allow ) +{ + m_defaultCellAttr->SetOverflow(allow); +} + void wxGrid::SetDefaultCellFont( const wxFont& font ) { m_defaultCellAttr->SetFont(font); @@ -7943,6 +8662,11 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) m_defaultCellAttr->GetAlignment(horiz, vert); } +bool wxGrid::GetDefaultCellOverflow() +{ + return m_defaultCellAttr->GetOverflow(); +} + wxGridCellRenderer *wxGrid::GetDefaultRenderer() const { return m_defaultCellAttr->GetRenderer(NULL, 0, 0); @@ -7988,6 +8712,21 @@ void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) attr->DecRef(); } +bool wxGrid::GetCellOverflow( int row, int col ) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + bool allow = attr->GetOverflow(); + attr->DecRef(); + return allow; +} + +void wxGrid::GetCellSize( int row, int col, int *num_rows, int *num_cols ) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + attr->GetSize( num_rows, num_cols ); + attr->DecRef(); +} + wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) { wxGridCellAttr* attr = GetCellAttr(row, col); @@ -8040,13 +8779,16 @@ void wxGrid::ClearAttrCache() void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const { - wxGrid *self = (wxGrid *)this; // const_cast + if ( attr != NULL ) + { + wxGrid *self = (wxGrid *)this; // const_cast - self->ClearAttrCache(); - self->m_attrCache.row = row; - self->m_attrCache.col = col; - self->m_attrCache.attr = attr; - wxSafeIncRef(attr); + self->ClearAttrCache(); + self->m_attrCache.row = row; + self->m_attrCache.col = col; + self->m_attrCache.attr = attr; + wxSafeIncRef(attr); + } } bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const @@ -8073,11 +8815,17 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const { - wxGridCellAttr *attr; - if ( !LookupAttr(row, col, &attr) ) + wxGridCellAttr *attr = NULL; + // Additional test to avoid looking at the cache e.g. for + // wxNoCellCoords, as this will confuse memory management. + if ( row >= 0 ) { - attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any) : (wxGridCellAttr *)NULL; - CacheAttr(row, col, attr); + if ( !LookupAttr(row, col, &attr) ) + { + attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any) + : (wxGridCellAttr *)NULL; + CacheAttr(row, col, attr); + } } if (attr) { @@ -8155,6 +8903,19 @@ void wxGrid::SetColFormatCustom(int col, const wxString& typeName) // setting cell attributes: this is forwarded to the table // ---------------------------------------------------------------------------- +void wxGrid::SetAttr(int row, int col, wxGridCellAttr *attr) +{ + if ( CanHaveAttributes() ) + { + m_table->SetAttr(attr, row, col); + ClearAttrCache(); + } + else + { + wxSafeDecRef(attr); + } +} + void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) { if ( CanHaveAttributes() ) @@ -8221,6 +8982,75 @@ void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert ) } } +void wxGrid::SetCellOverflow( int row, int col, bool allow ) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetOverflow(allow); + attr->DecRef(); + } +} + +void wxGrid::SetCellSize( int row, int col, int num_rows, int num_cols ) +{ + if ( CanHaveAttributes() ) + { + int cell_rows, cell_cols; + + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->GetSize(&cell_rows, &cell_cols); + attr->SetSize(num_rows, num_cols); + attr->DecRef(); + + // Cannot set the size of a cell to 0 or negative values + // While it is perfectly legal to do that, this function cannot + // handle all the possibilies, do it by hand by getting the CellAttr. + // You can only set the size of a cell to 1,1 or greater with this fn + wxASSERT_MSG( !((cell_rows < 1) || (cell_cols < 1)), + wxT("wxGrid::SetCellSize setting cell size that is already part of another cell")); + wxASSERT_MSG( !((num_rows < 1) || (num_cols < 1)), + wxT("wxGrid::SetCellSize setting cell size to < 1")); + + // if this was already a multicell then "turn off" the other cells first + if ((cell_rows > 1) || (cell_rows > 1)) + { + int i, j; + for (j=row; jSetSize( 1, 1 ); + attr_stub->DecRef(); + } + } + } + } + + // mark the cells that will be covered by this cell to + // negative or zero values to point back at this cell + if (((num_rows > 1) || (num_cols > 1)) && (num_rows >= 1) && (num_cols >= 1)) + { + int i, j; + for (j=row; jSetSize( row-j, col-i ); + attr_stub->DecRef(); + } + } + } + } + } +} + void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) { if ( CanHaveAttributes() ) @@ -8394,6 +9224,17 @@ void wxGrid::SetColSize( int col, int width ) InitColWidths(); } + // if < 0 calc new width from label + if( width < 0 ) + { + long w, h; + wxArrayString lines; + wxClientDC dc(m_colLabelWin); + dc.SetFont(GetLabelFont()); + StringToLines(GetColLabelValue(col), lines); + GetTextBoxSize(dc, lines, &w, &h); + width = w + 6; + } int w = wxMax( 0, width ); int diff = w - m_colWidths[col]; m_colWidths[col] = w; @@ -8599,13 +9440,17 @@ void wxGrid::AutoSize() // round up the size to a multiple of scroll step - this ensures that we // won't get the scrollbars if we're sized exactly to this width - wxSize sizeFit(GetScrollX(size.x) * GRID_SCROLL_LINE_X, - GetScrollY(size.y) * GRID_SCROLL_LINE_Y); + // CalcDimension adds m_extraWidth + 1 etc. to calculate the necessary + // scrollbar steps + wxSize sizeFit(GetScrollX(size.x + m_extraWidth + 1) * GRID_SCROLL_LINE_X, + GetScrollY(size.y + m_extraHeight + 1) * GRID_SCROLL_LINE_Y); - // distribute the extra space between teh columns/rows to avoid having + // distribute the extra space between the columns/rows to avoid having // extra white space - wxCoord diff = sizeFit.x - size.x; - if ( diff ) + + // Remove the extra m_extraWidth + 1 added above + wxCoord diff = sizeFit.x - size.x + (m_extraWidth + 1); + if ( diff && m_numCols ) { // try to resize the columns uniformly wxCoord diffPerCol = diff / m_numCols; @@ -8629,8 +9474,8 @@ void wxGrid::AutoSize() } // same for rows - diff = sizeFit.y - size.y; - if ( diff ) + diff = sizeFit.y - size.y - (m_extraHeight + 1); + if ( diff && m_numRows ) { // try to resize the columns uniformly wxCoord diffPerRow = diff / m_numRows; @@ -8663,8 +9508,17 @@ wxSize wxGrid::DoGetBestSize() const // don't set sizes, only calculate them wxGrid *self = (wxGrid *)this; // const_cast - return wxSize(self->SetOrCalcColumnSizes(TRUE), - self->SetOrCalcRowSizes(TRUE)); + int width, height; + width = self->SetOrCalcColumnSizes(TRUE); + height = self->SetOrCalcRowSizes(TRUE); + + int maxwidth, maxheight; + wxDisplaySize( & maxwidth, & maxheight ); + + if ( width > maxwidth ) width = maxwidth; + if ( height > maxheight ) height = maxheight; + + return wxSize( width, height ); } void wxGrid::Fit() @@ -8689,9 +9543,12 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s ) m_table->SetValue( row, col, s ); if ( !GetBatchCount() ) { - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - DrawCell( dc, wxGridCellCoords(row, col) ); + int dummy; + wxRect rect( CellToRect( row, col ) ); + rect.x = 0; + rect.width = m_gridWin->GetClientSize().GetWidth(); + CalcScrolledPosition(0, rect.y, &dummy, &rect.y); + m_gridWin->Refresh( FALSE, &rect ); } if ( m_currentCellCoords.GetRow() == row && @@ -8717,7 +9574,8 @@ void wxGrid::SelectRow( int row, bool addToSelected ) if ( IsSelection() && !addToSelected ) ClearSelection(); - m_selection->SelectRow( row, FALSE, addToSelected ); + if ( m_selection ) + m_selection->SelectRow( row, FALSE, addToSelected ); } @@ -8726,7 +9584,8 @@ void wxGrid::SelectCol( int col, bool addToSelected ) if ( IsSelection() && !addToSelected ) ClearSelection(); - m_selection->SelectCol( col, FALSE, addToSelected ); + if ( m_selection ) + m_selection->SelectCol( col, FALSE, addToSelected ); } @@ -8736,15 +9595,19 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, if ( IsSelection() && !addToSelected ) ClearSelection(); - m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol, - FALSE, addToSelected ); + if ( m_selection ) + m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol, + FALSE, addToSelected ); } void wxGrid::SelectAll() { if ( m_numRows > 0 && m_numCols > 0 ) - m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); + { + if ( m_selection ) + m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); + } } // @@ -8753,6 +9616,9 @@ void wxGrid::SelectAll() void wxGrid::DeselectRow( int row ) { + if ( !m_selection ) + return; + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) { if ( m_selection->IsInSelection(row, 0 ) ) @@ -8771,6 +9637,9 @@ void wxGrid::DeselectRow( int row ) void wxGrid::DeselectCol( int col ) { + if ( !m_selection ) + return; + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) { if ( m_selection->IsInSelection(0, col ) ) @@ -8789,31 +9658,59 @@ void wxGrid::DeselectCol( int col ) void wxGrid::DeselectCell( int row, int col ) { - if ( m_selection->IsInSelection(row, col) ) + if ( m_selection && m_selection->IsInSelection(row, col) ) m_selection->ToggleCellSelection(row, col); } bool wxGrid::IsSelection() { - return ( m_selection->IsSelection() || + return ( m_selection && (m_selection->IsSelection() || ( m_selectingTopLeft != wxGridNoCellCoords && - m_selectingBottomRight != wxGridNoCellCoords ) ); + m_selectingBottomRight != wxGridNoCellCoords) ) ); } -bool wxGrid::IsInSelection( int row, int col ) +bool wxGrid::IsInSelection( int row, int col ) const { - return ( m_selection->IsInSelection( row, col ) || + return ( m_selection && (m_selection->IsInSelection( row, col ) || ( row >= m_selectingTopLeft.GetRow() && col >= m_selectingTopLeft.GetCol() && row <= m_selectingBottomRight.GetRow() && - col <= m_selectingBottomRight.GetCol() ) ); + 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_blockSelectionBottomRight; +} +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; m_selectingBottomRight = wxGridNoCellCoords; - m_selection->ClearSelection(); + if ( m_selection ) + m_selection->ClearSelection(); } @@ -8846,11 +9743,63 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, return wxGridNoCellRect; } + int i, j; + int left = rect.GetLeft(); + int top = rect.GetTop(); + int right = rect.GetRight(); + int bottom = rect.GetBottom(); + + int leftCol = topLeft.GetCol(); + int topRow = topLeft.GetRow(); + int rightCol = bottomRight.GetCol(); + int bottomRow = bottomRight.GetRow(); + + if (left > right) + { + i = left; + left = right; + right = i; + i = leftCol; + leftCol=rightCol; + rightCol = i; + } + + if (top > bottom) + { + i = top; + top = bottom; + bottom = i; + i = topRow; + topRow = bottomRow; + bottomRow = i; + } + + + for ( j = topRow; j <= bottomRow; j++ ) + { + for ( i = leftCol; i <= rightCol; i++ ) + { + if ((j==topRow) || (j==bottomRow) || (i==leftCol) || (i==rightCol)) + { + cellRect = CellToRect( j, i ); + + if (cellRect.x < left) + left = cellRect.x; + if (cellRect.y < top) + top = cellRect.y; + if (cellRect.x + cellRect.width > right) + right = cellRect.x + cellRect.width; + if (cellRect.y + cellRect.height > bottom) + bottom = cellRect.y + cellRect.height; + } + else i = rightCol; // jump over inner cells. + } + } + // convert to scrolled coords // - int left, top, right, bottom; - CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top ); - CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom ); + CalcScrolledPosition( left, top, &left, &top ); + CalcScrolledPosition( right, bottom, &right, &bottom ); int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); @@ -8950,4 +9899,3 @@ wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type, #endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID #endif // wxUSE_GRID -