X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcfe4c3d715a669650457bade90e81cb2f9ce5c9..b51b78a9c7b50053cdcf4a22d2222500a20eb8ee:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 0355d2f816..6f7e9dbe17 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -39,12 +39,15 @@ #include "wx/dcclient.h" #include "wx/settings.h" #include "wx/log.h" + #include "wx/textctrl.h" + #include "wx/checkbox.h" #endif // this include needs to be outside precomp for BCC #include "wx/textfile.h" -#include "wx/generic/grid.h" +#include "wx/grid.h" + // ---------------------------------------------------------------------------- // array classes @@ -181,6 +184,7 @@ public: { } void OnKeyDown(wxKeyEvent& event); + void OnChar(wxKeyEvent& event); private: wxGrid* m_grid; @@ -193,6 +197,7 @@ private: IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler ) BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler ) EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown ) + EVT_CHAR( wxGridCellEditorEvtHandler::OnChar ) END_EVENT_TABLE() @@ -207,6 +212,8 @@ class WXDLLEXPORT wxGridCellAttrData public: void SetAttr(wxGridCellAttr *attr, int row, int col); wxGridCellAttr *GetAttr(int row, int col) const; + void UpdateAttrRows( size_t pos, int numRows ); + void UpdateAttrCols( size_t pos, int numCols ); private: // searches for the attr for given cell, returns wxNOT_FOUND if not found @@ -223,6 +230,7 @@ public: void SetAttr(wxGridCellAttr *attr, int rowOrCol); wxGridCellAttr *GetAttr(int rowOrCol) const; + void UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols ); private: wxArrayInt m_rowsOrCols; @@ -268,7 +276,6 @@ static const size_t GRID_SCROLL_LINE = 10; // implementation // ============================================================================ - // ---------------------------------------------------------------------------- // wxGridCellEditor // ---------------------------------------------------------------------------- @@ -284,20 +291,77 @@ wxGridCellEditor::~wxGridCellEditor() Destroy(); } +void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent), + wxWindowID WXUNUSED(id), + wxEvtHandler* evtHandler) +{ + if (evtHandler) + m_control->PushEventHandler(evtHandler); +} void wxGridCellEditor::Destroy() { - if (m_control) { + if (m_control) + { m_control->Destroy(); m_control = NULL; } } -void wxGridCellEditor::Show(bool show) +void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) { wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); m_control->Show(show); + + if ( show ) + { + // set the colours/fonts if we have any + if ( attr ) + { + if ( attr->HasTextColour() ) + { + m_colFgOld = m_control->GetForegroundColour(); + m_control->SetForegroundColour(attr->GetTextColour()); + } + + if ( attr->HasBackgroundColour() ) + { + m_colBgOld = m_control->GetBackgroundColour(); + m_control->SetBackgroundColour(attr->GetBackgroundColour()); + } + + if ( attr->HasFont() ) + { + m_fontOld = m_control->GetFont(); + m_control->SetFont(attr->GetFont()); + } + + // can't do anything more in the base class version, the other + // attributes may only be used by the derived classes + } + } + else + { + // restore the standard colours fonts + if ( m_colFgOld.Ok() ) + { + m_control->SetForegroundColour(m_colFgOld); + m_colFgOld = wxNullColour; + } + + if ( m_colBgOld.Ok() ) + { + m_control->SetBackgroundColour(m_colBgOld); + m_colBgOld = wxNullColour; + } + + if ( m_fontOld.Ok() ) + { + m_control->SetFont(m_fontOld); + m_fontOld = wxNullFont; + } + } } void wxGridCellEditor::SetSize(const wxRect& rect) @@ -313,57 +377,66 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event) } +void wxGridCellEditor::StartingKey(wxKeyEvent& event) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + // pass the event to the control + m_control->GetEventHandler()->ProcessEvent(event); +} + +// ---------------------------------------------------------------------------- +// wxGridCellTextEditor +// ---------------------------------------------------------------------------- + wxGridCellTextEditor::wxGridCellTextEditor() { } void wxGridCellTextEditor::Create(wxWindow* parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, wxEvtHandler* evtHandler) { - m_control = new wxTextCtrl(parent, -1, "", pos, size + m_control = new wxTextCtrl(parent, id, wxEmptyString, + wxDefaultPosition, wxDefaultSize #if defined(__WXMSW__) - , wxTE_MULTILINE | wxTE_NO_VSCROLL + , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ??? #endif - ); + ); - if (evtHandler) - m_control->PushEventHandler(evtHandler); + wxGridCellEditor::Create(parent, id, evtHandler); } -void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid, - wxGridCellAttr* attr) +void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid) { wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); m_startValue = grid->GetTable()->GetValue(row, col); - ((wxTextCtrl*)m_control)->SetValue(m_startValue); - ((wxTextCtrl*)m_control)->SetInsertionPointEnd(); - ((wxTextCtrl*)m_control)->SetFocus(); - - // ??? Should we use attr and try to set colours and font? + Text()->SetValue(m_startValue); + Text()->SetInsertionPointEnd(); + Text()->SetFocus(); } - bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue, - wxGrid* grid, wxGridCellAttr* attr) + wxGrid* grid) { wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); bool changed = FALSE; - wxString value = ((wxTextCtrl*)m_control)->GetValue(); + wxString value = Text()->GetValue(); if (value != m_startValue) changed = TRUE; if (changed) grid->GetTable()->SetValue(row, col, value); - m_startValue = ""; + + m_startValue = wxEmptyString; + Text()->SetValue(m_startValue); return changed; } @@ -374,19 +447,43 @@ void wxGridCellTextEditor::Reset() wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); - ((wxTextCtrl*)m_control)->SetValue(m_startValue); - ((wxTextCtrl*)m_control)->SetInsertionPointEnd(); + Text()->SetValue(m_startValue); + Text()->SetInsertionPointEnd(); +} + +void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) +{ + if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() ) + { + // insert the key in the control + long keycode = event.KeyCode(); + if ( isprint(keycode) ) + { + // FIXME this is not going to work for non letters... + if ( !event.ShiftDown() ) + { + keycode = tolower(keycode); + } + + Text()->AppendText((wxChar)keycode); + + return; + } + + } + + event.Skip(); } void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event) { #if defined(__WXMOTIF__) || defined(__WXGTK__) // wxMotif needs a little extra help... - int pos = ((wxTextCtrl*)m_control)->GetInsertionPoint(); - wxString s( ((wxTextCtrl*)m_control)->GetValue() ); + int pos = Text()->GetInsertionPoint(); + wxString s( Text()->GetValue() ); s = s.Left(pos) + "\n" + s.Mid(pos); - ((wxTextCtrl*)m_control)->SetValue(s); - ((wxTextCtrl*)m_control)->SetInsertionPoint( pos ); + Text()->SetValue(s); + Text()->SetInsertionPoint( pos ); #else // the other ports can handle a Return key press // @@ -394,6 +491,107 @@ void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event) #endif } +// ---------------------------------------------------------------------------- +// wxGridCellBoolEditor +// ---------------------------------------------------------------------------- + +void wxGridCellBoolEditor::Create(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler) +{ + m_control = new wxCheckBox(parent, id, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxNO_BORDER); + + wxGridCellEditor::Create(parent, id, evtHandler); +} + +void wxGridCellBoolEditor::SetSize(const wxRect& r) +{ + m_rectCell = r; + // position it in the centre of the rectangle (TODO: support alignment?) + wxCoord w, h; + m_control->GetSize(&w, &h); + + // the checkbox without label still has some space to the right in wxGTK, + // so shift it to the right +#ifdef __WXGTK__ + w += 8; +#endif // GTK + + m_control->Move(r.x + r.width/2 - w/2, r.y + r.height/2 - h/2); +} + +void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr) +{ + wxGridCellEditor::Show(show, attr); + if ( !show ) + return; + + // get the bg colour to use + wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY; + + // erase the background because we don't fill the cell + if ( m_rectCell.width > 0 ) + { + wxClientDC dc(m_control->GetParent()); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(colBg, wxSOLID)); + dc.DrawRectangle(m_rectCell); + + m_rectCell.width = 0; + } + + CBox()->SetBackgroundColour(colBg); +} + +void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + m_startValue = !!grid->GetTable()->GetValue(row, col); // FIXME-DATA + CBox()->SetValue(m_startValue); + CBox()->SetFocus(); +} + +bool wxGridCellBoolEditor::EndEdit(int row, int col, + bool saveValue, + wxGrid* grid) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + bool changed = FALSE; + bool value = CBox()->GetValue(); + if ( value != m_startValue ) + changed = TRUE; + + if ( changed ) + { + // FIXME-DATA + grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString); + } + + return changed; +} + +void wxGridCellBoolEditor::Reset() +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + CBox()->SetValue(m_startValue); +} + +void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event) +{ + event.Skip(); +} + +// ---------------------------------------------------------------------------- +// wxGridCellEditorEvtHandler +// ---------------------------------------------------------------------------- void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) { @@ -401,18 +599,10 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) { case WXK_ESCAPE: m_editor->Reset(); + m_grid->DisableCellEditControl(); break; - case WXK_UP: - case WXK_DOWN: - case WXK_LEFT: - case WXK_RIGHT: - case WXK_PRIOR: - case WXK_NEXT: - case WXK_SPACE: - // send the event to the parent grid, skipping the - // event if nothing happens - // + case WXK_TAB: event.Skip( m_grid->ProcessEvent( event ) ); break; @@ -421,12 +611,19 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) m_editor->HandleReturn(event); break; - case WXK_HOME: - case WXK_END: - // send the event to the parent grid, skipping the - // event if nothing happens - // - event.Skip( m_grid->ProcessEvent( event ) ); + + default: + event.Skip(); + } +} + +void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) +{ + switch ( event.KeyCode() ) + { + case WXK_ESCAPE: + case WXK_TAB: + case WXK_RETURN: break; default: @@ -434,6 +631,10 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) } } +// ============================================================================ +// renderer classes +// ============================================================================ + // ---------------------------------------------------------------------------- // wxGridCellRenderer // ---------------------------------------------------------------------------- @@ -460,6 +661,10 @@ void wxGridCellRenderer::Draw(wxGrid& grid, dc.DrawRectangle(rect); } +// ---------------------------------------------------------------------------- +// wxGridCellStringRenderer +// ---------------------------------------------------------------------------- + void wxGridCellStringRenderer::Draw(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, @@ -472,6 +677,8 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, // now we only have to draw the text dc.SetBackgroundMode( wxTRANSPARENT ); + // TODO some special colours for attr.IsReadOnly() case? + if ( isSelected ) { dc.SetTextBackground( grid.GetSelectionBackground() ); @@ -497,6 +704,40 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, rect, hAlign, vAlign); } +// ---------------------------------------------------------------------------- +// wxGridCellBoolRenderer +// ---------------------------------------------------------------------------- + +void wxGridCellBoolRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rect, + int row, int col, + bool isSelected) +{ + wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected); + + // position it in the centre (ignoring alignment - TODO) + static const wxCoord checkSize = 16; + + wxRect rectMark; + rectMark.x = rect.x + rect.width/2 - checkSize/2; + rectMark.y = rect.y + rect.height/2 - checkSize/2; + rectMark.width = rectMark.height = checkSize; + + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID)); + dc.DrawRectangle(rectMark); + + rectMark.Inflate(-4); + + if ( !!grid.GetTable()->GetValue(row, col) ) // FIXME-DATA + { + dc.SetTextForeground(attr.GetTextColour()); + dc.DrawCheckMark(rectMark); + } +} + // ---------------------------------------------------------------------------- // wxGridCellAttr // ---------------------------------------------------------------------------- @@ -504,10 +745,15 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid, const wxColour& wxGridCellAttr::GetTextColour() const { if (HasTextColour()) + { return m_colText; + } else if (m_defGridAttr != this) + { return m_defGridAttr->GetTextColour(); - else { + } + else + { wxFAIL_MSG(wxT("Missing default cell attribute")); return wxNullColour; } @@ -520,7 +766,8 @@ const wxColour& wxGridCellAttr::GetBackgroundColour() const return m_colBack; else if (m_defGridAttr != this) return m_defGridAttr->GetBackgroundColour(); - else { + else + { wxFAIL_MSG(wxT("Missing default cell attribute")); return wxNullColour; } @@ -533,7 +780,8 @@ const wxFont& wxGridCellAttr::GetFont() const return m_font; else if (m_defGridAttr != this) return m_defGridAttr->GetFont(); - else { + else + { wxFAIL_MSG(wxT("Missing default cell attribute")); return wxNullFont; } @@ -542,13 +790,15 @@ const wxFont& wxGridCellAttr::GetFont() const void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const { - if (HasAlignment()) { + if (HasAlignment()) + { if ( hAlign ) *hAlign = m_hAlign; if ( vAlign ) *vAlign = m_vAlign; } else if (m_defGridAttr != this) m_defGridAttr->GetAlignment(hAlign, vAlign); - else { + else + { wxFAIL_MSG(wxT("Missing default cell attribute")); } } @@ -560,7 +810,21 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer() const return m_renderer; else if (m_defGridAttr != this) return m_defGridAttr->GetRenderer(); - else { + else + { + wxFAIL_MSG(wxT("Missing default cell attribute")); + return NULL; + } +} + +wxGridCellEditor* wxGridCellAttr::GetEditor() const +{ + if (HasEditor()) + return m_editor; + else if (m_defGridAttr != this) + return m_defGridAttr->GetEditor(); + else + { wxFAIL_MSG(wxT("Missing default cell attribute")); return NULL; } @@ -607,6 +871,72 @@ wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const return attr; } +void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows ) +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxGridCellCoords& coords = m_attrs[n].coords; + wxCoord row = coords.GetRow(); + if ((size_t)row >= pos) + { + if (numRows > 0) + { + // If rows inserted, include row counter where necessary + coords.SetRow(row + numRows); + } + else if (numRows < 0) + { + // If rows deleted ... + if ((size_t)row >= pos - numRows) + { + // ...either decrement row counter (if row still exists)... + coords.SetRow(row + numRows); + } + else + { + // ...or remove the attribute + m_attrs.RemoveAt((size_t)n); + n--; count--; + } + } + } + } +} + +void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols ) +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxGridCellCoords& coords = m_attrs[n].coords; + wxCoord col = coords.GetCol(); + if ( (size_t)col >= pos ) + { + if ( numCols > 0 ) + { + // If rows inserted, include row counter where necessary + coords.SetCol(col + numCols); + } + else if (numCols < 0) + { + // If rows deleted ... + if ((size_t)col >= pos - numCols) + { + // ...either decrement row counter (if row still exists)... + coords.SetCol(col + numCols); + } + else + { + // ...or remove the attribute + m_attrs.RemoveAt((size_t)n); + n--; count--; + } + } + } + } +} + int wxGridCellAttrData::FindIndex(int row, int col) const { size_t count = m_attrs.GetCount(); @@ -675,6 +1005,35 @@ void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol) } } +void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols ) +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + int & rowOrCol = m_rowsOrCols[n]; + if ( (size_t)rowOrCol >= pos ) + { + if ( numRowsOrCols > 0 ) + { + // If rows inserted, include row counter where necessary + rowOrCol += numRowsOrCols; + } + else if ( numRowsOrCols < 0) + { + // If rows deleted, either decrement row counter (if row still exists) + if ((size_t)rowOrCol >= pos - numRowsOrCols) + rowOrCol += numRowsOrCols; + else + { + m_rowsOrCols.RemoveAt((size_t)n); + m_attrs.RemoveAt((size_t)n); + n--; count--; + } + } + } + } +} + // ---------------------------------------------------------------------------- // wxGridCellAttrProvider // ---------------------------------------------------------------------------- @@ -744,6 +1103,26 @@ void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col) m_data->m_colAttrs.SetAttr(attr, col); } +void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows ) +{ + if ( m_data ) + { + m_data->m_cellAttrs.UpdateAttrRows( pos, numRows ); + + m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows ); + } +} + +void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols ) +{ + if ( m_data ) + { + m_data->m_cellAttrs.UpdateAttrCols( pos, numCols ); + + m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols ); + } +} + // ---------------------------------------------------------------------------- // wxGridTableBase // ---------------------------------------------------------------------------- @@ -822,6 +1201,22 @@ void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col) } } +void wxGridTableBase::UpdateAttrRows( size_t pos, int numRows ) +{ + if ( m_attrProvider ) + { + m_attrProvider->UpdateAttrRows( pos, numRows ); + } +} + +void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols ) +{ + if ( m_attrProvider ) + { + m_attrProvider->UpdateAttrCols( pos, numCols ); + } +} + bool wxGridTableBase::InsertRows( size_t pos, size_t numRows ) { wxFAIL_MSG( wxT("Called grid table class function InsertRows\n" @@ -1049,7 +1444,7 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) { m_data.Insert( sa, row ); } - + UpdateAttrRows( pos, numRows ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -1129,7 +1524,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) m_data.Remove( pos ); } } - + UpdateAttrRows( pos, -((int)numRows) ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -1162,7 +1557,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) m_data[row].Insert( wxEmptyString, col ); } } - + UpdateAttrCols( pos, numCols ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -1246,7 +1641,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) } } } - + UpdateAttrCols( pos, -((int)numCols) ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -1320,116 +1715,7 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) - ////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC_CLASS( wxGridTextCtrl, wxTextCtrl ) - -BEGIN_EVENT_TABLE( wxGridTextCtrl, wxTextCtrl ) - EVT_KEY_DOWN( wxGridTextCtrl::OnKeyDown ) -END_EVENT_TABLE() - - -wxGridTextCtrl::wxGridTextCtrl( wxWindow *par, - wxGrid *grid, - bool isCellControl, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style ) - : wxTextCtrl( par, id, value, pos, size, style ) -{ - m_grid = grid; - m_isCellControl = isCellControl; -} - - -void wxGridTextCtrl::OnKeyDown( wxKeyEvent& event ) -{ - switch ( event.KeyCode() ) - { - case WXK_ESCAPE: - m_grid->SetEditControlValue( startValue ); - SetInsertionPointEnd(); - break; - - case WXK_UP: - case WXK_DOWN: - case WXK_LEFT: - case WXK_RIGHT: - case WXK_PRIOR: - case WXK_NEXT: - case WXK_SPACE: - if ( m_isCellControl ) - { - // send the event to the parent grid, skipping the - // event if nothing happens - // - event.Skip( m_grid->ProcessEvent( event ) ); - } - else - { - // default text control response within the top edit - // control - // - event.Skip(); - } - break; - - case WXK_RETURN: - if ( m_isCellControl ) - { - if ( !m_grid->ProcessEvent( event ) ) - { -#if defined(__WXMOTIF__) || defined(__WXGTK__) - // wxMotif needs a little extra help... - // - int pos = GetInsertionPoint(); - wxString s( GetValue() ); - s = s.Left(pos) + "\n" + s.Mid(pos); - SetValue(s); - SetInsertionPoint( pos ); -#else - // the other ports can handle a Return key press - // - event.Skip(); -#endif - } - } - break; - - case WXK_HOME: - case WXK_END: - if ( m_isCellControl ) - { - // send the event to the parent grid, skipping the - // event if nothing happens - // - event.Skip( m_grid->ProcessEvent( event ) ); - } - else - { - // default text control response within the top edit - // control - // - event.Skip(); - } - break; - - default: - event.Skip(); - } -} - -void wxGridTextCtrl::SetStartValue( const wxString& s ) -{ - startValue = s; - wxTextCtrl::SetValue(s); -} - - - ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow ) @@ -1657,8 +1943,10 @@ void wxGridWindow::OnEraseBackground(wxEraseEvent&) + ////////////////////////////////////////////////////////////////////// + IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow ) BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow ) @@ -1705,11 +1993,12 @@ wxGrid::~wxGrid() void wxGrid::Create() { m_created = FALSE; // set to TRUE by CreateGrid - m_displayed = FALSE; // set to TRUE by OnPaint + m_displayed = TRUE; // FALSE; // set to TRUE by OnPaint m_table = (wxGridTableBase *) NULL; m_ownTable = FALSE; - m_cellEditCtrl = (wxWindow *) NULL; + + m_cellEditCtrlEnabled = FALSE; m_defaultCellAttr = new wxGridCellAttr; m_defaultCellAttr->SetDefAttr(m_defaultCellAttr); @@ -1775,6 +2064,11 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership ) { 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? + wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); return FALSE; } @@ -1862,9 +2156,11 @@ void wxGrid::Init() m_colRights.Add( colRight ); } + // Set default cell attributes m_defaultCellAttr->SetFont(GetFont()); m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP); m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer); + m_defaultCellAttr->SetEditor(new wxGridCellTextEditor); m_defaultCellAttr->SetTextColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT)); m_defaultCellAttr->SetBackgroundColour( @@ -1879,6 +2175,9 @@ void wxGrid::Init() m_dragLastPos = -1; m_dragRowOrCol = -1; m_isDragging = FALSE; + m_startDragPos = wxDefaultPosition; + + m_waitForSlowClick = FALSE; m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS ); m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE ); @@ -1895,23 +2194,6 @@ void wxGrid::Init() m_inOnKeyDown = FALSE; m_batchCount = 0; - // TODO: extend this to other types of controls - // - m_cellEditCtrl = new wxGridTextCtrl( m_gridWin, - this, - FALSE, - wxGRID_CELLCTRL, - "", - wxPoint(1,1), - wxSize(1,1) -#if defined(__WXMSW__) - , wxTE_MULTILINE | wxTE_NO_VSCROLL -#endif - ); - - m_cellEditCtrl->Show( FALSE ); - m_cellEditCtrlEnabled = FALSE; - m_editCtrlType = wxGRID_TEXTCTRL; } @@ -2271,7 +2553,7 @@ void wxGrid::CalcCellsExposed( wxRegion& reg ) int colLeft, rowTop; for ( row = 0; row < m_numRows; row++ ) { - if ( m_rowBottoms[row] < top ) continue; + if ( m_rowBottoms[row] <= top ) continue; rowTop = m_rowBottoms[row] - m_rowHeights[row]; if ( rowTop > bottom ) break; @@ -2280,7 +2562,7 @@ void wxGrid::CalcCellsExposed( wxRegion& reg ) for ( col = 0; col < m_numCols; col++ ) { - if ( m_colRights[col] < left ) continue; + if ( m_colRights[col] <= left ) continue; colLeft = m_colRights[col] - m_colWidths[col]; if ( colLeft > right ) break; @@ -2317,6 +2599,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); + y = wxMax( y, + m_rowBottoms[m_dragRowOrCol] - + m_rowHeights[m_dragRowOrCol] + + WXGRID_MIN_ROW_HEIGHT ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2366,7 +2652,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { row = YToRow(y); if ( row >= 0 && - !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) + !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) { SelectRow( row, event.ShiftDown() ); ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin); @@ -2388,7 +2674,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if ( YToEdgeOfRow(y) < 0 ) { row = YToRow(y); - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ); + SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ); } } @@ -2404,7 +2690,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) // Note: we are ending the event *after* doing // default processing in this case // - SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); + SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); } ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); @@ -2417,7 +2703,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDown() ) { row = YToRow(y); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) { // no default action at the moment } @@ -2429,7 +2715,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDClick() ) { row = YToRow(y); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) { // no default action at the moment } @@ -2479,6 +2765,10 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); + x = wxMax( x, + m_colRights[m_dragRowOrCol] - + m_colWidths[m_dragRowOrCol] + + WXGRID_MIN_COL_WIDTH ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2528,7 +2818,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { col = XToCol(x); if ( col >= 0 && - !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) + !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) { SelectCol( col, event.ShiftDown() ); ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin); @@ -2550,7 +2840,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if ( XToEdgeOfCol(x) < 0 ) { col = XToCol(x); - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ); + SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ); } } @@ -2566,7 +2856,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) // Note: we are ending the event *after* doing // default processing in this case // - SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); + SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); } ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); @@ -2579,7 +2869,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDown() ) { col = XToCol(x); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) { // no default action at the moment } @@ -2591,7 +2881,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDClick() ) { col = XToCol(x); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) { // no default action at the moment } @@ -2626,7 +2916,7 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) // indicate corner label by having both row and // col args == -1 // - if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) ) { SelectAll(); } @@ -2634,12 +2924,12 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) else if ( event.LeftDClick() ) { - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event ); + SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event ); } else if ( event.RightDown() ) { - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) ) { // no default action at the moment } @@ -2647,7 +2937,7 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDClick() ) { - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) ) { // no default action at the moment } @@ -2729,6 +3019,21 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( event.Dragging() ) { + //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol()); + + // Don't start doing anything until the mouse has been drug at + // least 3 pixels in any direction... + if (! m_isDragging) + { + if (m_startDragPos == wxDefaultPosition) + { + m_startDragPos = pos; + return; + } + if (abs(m_startDragPos.x - pos.x) < 4 && abs(m_startDragPos.y - pos.y) < 4) + return; + } + m_isDragging = TRUE; if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { @@ -2736,6 +3041,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // won't interfer with drag-shrinking. if ( IsCellEditControlEnabled() ) HideCellEditControl(); + + // Have we captured the mouse yet? + if (! m_winCapture) + { + m_winCapture = m_gridWin; + m_winCapture->CaptureMouse(); + } + if ( coords != wxGridNoCellCoords ) { if ( !IsSelection() ) @@ -2746,6 +3059,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { SelectBlock( m_currentCellCoords, coords ); } + + if (! IsVisible(coords)) + { + MakeCellVisible(coords); + // TODO: need to introduce a delay or something here. The + // scrolling is way to fast, at least on MSW. + } } } else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) @@ -2756,6 +3076,10 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); + y = wxMax( y, + m_rowBottoms[m_dragRowOrCol] - + m_rowHeights[m_dragRowOrCol] + + WXGRID_MIN_ROW_HEIGHT ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2772,6 +3096,9 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); + x = wxMax( x, + m_colRights[m_dragRowOrCol] - + m_colWidths[m_dragRowOrCol] + WXGRID_MIN_COL_WIDTH ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2785,6 +3112,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) } m_isDragging = FALSE; + m_startDragPos = wxDefaultPosition; + if ( coords != wxGridNoCellCoords ) { @@ -2804,16 +3133,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // if ( event.LeftDown() ) { - if ( event.AltDown() ) - { - MakeCellVisible( coords ); - SetCurrentCell( coords ); - EnableCellEditControl( TRUE ); - } - else - { - EnableCellEditControl( FALSE ); - } + DisableCellEditControl(); if ( event.ShiftDown() ) { SelectBlock( m_currentCellCoords, coords ); @@ -2821,13 +3141,27 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) else if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) { - if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK, + if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK, coords.GetRow(), coords.GetCol(), event ) ) { MakeCellVisible( coords ); - SetCurrentCell( coords ); + + // if this is the second click on this cell then start + // the edit control + if ( m_waitForSlowClick && + (coords == m_currentCellCoords) && + CanEnableCellControl()) + { + EnableCellEditControl(); + m_waitForSlowClick = FALSE; + } + else + { + SetCurrentCell( coords ); + m_waitForSlowClick = TRUE; + } } } } @@ -2837,10 +3171,10 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.LeftDClick() ) { - EnableCellEditControl( FALSE ); + DisableCellEditControl(); if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) { - SendEvent( EVT_GRID_CELL_LEFT_DCLICK, + SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK, coords.GetRow(), coords.GetCol(), event ); @@ -2856,13 +3190,17 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if ( IsSelection() ) { - SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event ); + if (m_winCapture) + { + m_winCapture->ReleaseMouse(); + m_winCapture = NULL; + } + SendEvent( wxEVT_GRID_RANGE_SELECT, -1, -1, event ); } - // Show the edit control, if it has - // been hidden for drag-shrinking. - if ( IsCellEditControlEnabled() ) - ShowCellEditControl(); + // Show the edit control, if it has been hidden for + // drag-shrinking. + ShowCellEditControl(); } else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) { @@ -2872,7 +3210,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // Note: we are ending the event *after* doing // default processing in this case // - SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); + SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); } else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) { @@ -2882,7 +3220,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // Note: we are ending the event *after* doing // default processing in this case // - SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); + SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); } m_dragLastPos = -1; @@ -2893,8 +3231,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.RightDown() ) { - EnableCellEditControl( FALSE ); - if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK, + DisableCellEditControl(); + if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK, coords.GetRow(), coords.GetCol(), event ) ) @@ -2908,8 +3246,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.RightDClick() ) { - EnableCellEditControl( FALSE ); - if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK, + DisableCellEditControl(); + if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK, coords.GetRow(), coords.GetCol(), event ) ) @@ -3102,6 +3440,9 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if ( m_table ) { + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + bool ok = m_table->InsertRows( pos, numRows ); // the table will have sent the results of the insert row @@ -3184,24 +3525,23 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) return FALSE; } - if ( m_table && m_table->DeleteRows( pos, numRows ) ) + if ( m_table ) { - // the table will have sent the results of the delete row - // operation to this view object as a grid table message - // - if ( m_numRows > 0 ) - SetEditControlValue(); - else - HideCellEditControl(); + if (IsCellEditControlEnabled()) + DisableCellEditControl(); - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - return TRUE; - } - else - { - return FALSE; + if (m_table->DeleteRows( pos, numRows )) + { + + // the table will have sent the results of the delete row + // operation to this view object as a grid table message + // + ClearSelection(); + if ( !GetBatchCount() ) Refresh(); + return TRUE; + } } + return FALSE; } @@ -3217,7 +3557,9 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if ( m_table ) { - HideCellEditControl(); + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + bool ok = m_table->InsertCols( pos, numCols ); // the table will have sent the results of the insert col @@ -3291,24 +3633,22 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) return FALSE; } - if ( m_table && m_table->DeleteCols( pos, numCols ) ) + if ( m_table ) { - // the table will have sent the results of the delete col - // operation to this view object as a grid table message - // - if ( m_numCols > 0 ) - SetEditControlValue(); - else - HideCellEditControl(); + if (IsCellEditControlEnabled()) + DisableCellEditControl(); - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - return TRUE; - } - else - { - return FALSE; + if ( m_table->DeleteCols( pos, numCols ) ) + { + // the table will have sent the results of the delete col + // operation to this view object as a grid table message + // + ClearSelection(); + if ( !GetBatchCount() ) Refresh(); + return TRUE; + } } + return FALSE; } @@ -3324,8 +3664,7 @@ bool wxGrid::SendEvent( const wxEventType type, int row, int col, wxMouseEvent& mouseEv ) { - if ( type == EVT_GRID_ROW_SIZE || - type == EVT_GRID_COL_SIZE ) + if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { int rowOrCol = (row == -1 ? col : row); @@ -3341,7 +3680,7 @@ bool wxGrid::SendEvent( const wxEventType type, return GetEventHandler()->ProcessEvent(gridEvt); } - else if ( type == EVT_GRID_RANGE_SELECT ) + else if ( type == wxEVT_GRID_RANGE_SELECT ) { wxGridRangeSelectEvent gridEvt( GetId(), type, @@ -3378,8 +3717,7 @@ bool wxGrid::SendEvent( const wxEventType type, bool wxGrid::SendEvent( const wxEventType type, int row, int col ) { - if ( type == EVT_GRID_ROW_SIZE || - type == EVT_GRID_COL_SIZE ) + if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { int rowOrCol = (row == -1 ? col : row); @@ -3435,7 +3773,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) { // shouldn't be here - we are going round in circles... // - wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while alread active") ); + wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") ); } m_inOnKeyDown = TRUE; @@ -3448,6 +3786,12 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) ) { + + // TODO: Should also support Shift-cursor keys for + // extending the selection. Maybe add a flag to + // MoveCursorXXX() and MoveCursorXXXBlock() and + // just send event.ShiftDown(). + // try local handlers // switch ( event.KeyCode() ) @@ -3496,17 +3840,6 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) } break; - case WXK_SPACE: - if ( !IsEditable() ) - { - MoveCursorRight(); - } - else - { - event.Skip(); - } - break; - case WXK_RETURN: if ( event.ControlDown() ) { @@ -3518,6 +3851,13 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) } break; + case WXK_TAB: + if (event.ShiftDown()) + MoveCursorLeft(); + else + MoveCursorRight(); + break; + case WXK_HOME: if ( event.ControlDown() ) { @@ -3550,29 +3890,47 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) MovePageDown(); break; + // We don't want these keys to trigger the edit control, any others? + case WXK_SHIFT: + case WXK_ALT: + case WXK_CONTROL: + case WXK_CAPITAL: + event.Skip(); + break; + + case WXK_SPACE: + if ( !IsEditable() ) + { + MoveCursorRight(); + break; + } + // Otherwise fall through to default + default: // now try the cell edit control // - if ( !IsCellEditControlEnabled() ) - EnableCellEditControl( TRUE ); - if ( IsCellEditControlEnabled() ) - { - event.SetEventObject( m_cellEditCtrl ); - m_cellEditCtrl->GetEventHandler()->ProcessEvent( event ); - } - break; + if ( !IsCellEditControlEnabled() && CanEnableCellControl() ) + { + EnableCellEditControl(); + wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); + attr->GetEditor()->StartingKey(event); + attr->DecRef(); + } + break; } } m_inOnKeyDown = FALSE; } + void wxGrid::OnEraseBackground(wxEraseEvent&) -{ } +{ +} void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) { - if ( SendEvent( EVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) ) + if ( SendEvent( wxEVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) ) { // the event has been intercepted - do nothing return; @@ -3583,15 +3941,29 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) { HideCellEditControl(); SaveEditControlValue(); + DisableCellEditControl(); + + // Clear the old current cell highlight + wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); + + // Otherwise refresh redraws the highlight! + m_currentCellCoords = coords; + + m_gridWin->Refresh( FALSE, &r ); } m_currentCellCoords = coords; SetEditControlValue(); -#if 0 + if ( m_displayed ) { - ShowCellEditControl(); + wxClientDC dc(m_gridWin); + PrepareDC(dc); + + wxGridCellAttr* attr = GetCellAttr(coords); + DrawCellHighlight(dc, attr); + attr->DecRef(); if ( IsSelection() ) { @@ -3600,9 +3972,6 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r ); } } -#else - SelectBlock ( coords, coords ); -#endif } @@ -3678,19 +4047,81 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) DrawCellBorder( dc, coords ); #endif + // don't draw the cell over the active edit control! + if ( (coords == m_currentCellCoords) && IsCellEditControlEnabled() ) + return; + // but all the rest is drawn by the cell renderer and hence may be // customized wxRect rect; rect.x = m_colRights[col] - m_colWidths[col]; rect.y = m_rowBottoms[row] - m_rowHeights[row]; - rect.width = m_colWidths[col] - 1; - rect.height = m_rowHeights[row] - 1; + rect.width = m_colWidths[col]-1; + rect.height = m_rowHeights[row]-1; wxGridCellAttr* attr = GetCellAttr(row, col); attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords)); + + if (m_currentCellCoords == coords) + DrawCellHighlight(dc, attr); + attr->DecRef(); } +void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) +{ + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + + if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 ) + return; + + wxRect rect; + rect.x = m_colRights[col] - m_colWidths[col]; + rect.y = m_rowBottoms[row] - m_rowHeights[row]; + rect.width = m_colWidths[col] - 1; + rect.height = m_rowHeights[row] - 1; + + if ( attr->IsReadOnly() ) + { + // hmmm... what could we do here to show that the cell is disabled? + // for now, I just draw a thinner border than for the other ones, but + // it doesn't look really good + dc.SetPen(wxPen(m_gridLineColour, 2, wxSOLID)); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + dc.DrawRectangle(rect); + } + else + { + // VZ: my experiments with 3d borders... +#if 0 + dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID)); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + dc.DrawRectangle(rect); +#else //1 + // FIXME we should properly set colours for arbitrary bg + wxCoord x1 = rect.x, + y1 = rect.y, + x2 = rect.x + rect.width, + y2 = rect.y + rect.height; + + dc.SetPen(*wxWHITE_PEN); + dc.DrawLine(x1, y1, x2 - 1, y1); + dc.DrawLine(x1, y1, x1, y2 - 1); + + dc.SetPen(*wxLIGHT_GREY_PEN); + dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1); + dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 - 1); + + dc.SetPen(*wxBLACK_PEN); + dc.DrawLine(x1, y2, x2, y2); + dc.DrawLine(x2, y1, x2, y2); +#endif // 0/1 + } +} + void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) { if ( m_colWidths[coords.GetCol()] <=0 || @@ -3724,7 +4155,8 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) int top, bottom, left, right; - if (reg.IsEmpty()){ + if (reg.IsEmpty()) + { int cw, ch; m_gridWin->GetClientSize(&cw, &ch); @@ -3733,7 +4165,8 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) CalcUnscrolledPosition( 0, 0, &left, &top ); CalcUnscrolledPosition( cw, ch, &right, &bottom ); } - else{ + else + { wxCoord x, y, w, h; reg.GetBox(x, y, w, h); CalcUnscrolledPosition( x, y, &left, &top ); @@ -4006,46 +4439,79 @@ void wxGrid::EnableEditing( bool edit ) { m_editable = edit; - // TODO: extend this for other edit control types - // - if ( m_editCtrlType == wxGRID_TEXTCTRL ) - { - ((wxTextCtrl *)m_cellEditCtrl)->SetEditable( m_editable ); - } + // FIXME IMHO this won't disable the edit control if edit == FALSE + // because of the check in the beginning of + // EnableCellEditControl() just below (VZ) + EnableCellEditControl(m_editable); } } void wxGrid::EnableCellEditControl( bool enable ) { + if (! m_editable) + return; + if ( m_currentCellCoords == wxGridNoCellCoords ) SetCurrentCell( 0, 0 ); - if ( m_cellEditCtrl && - enable != m_cellEditCtrlEnabled ) + + if ( enable != m_cellEditCtrlEnabled ) { + // TODO allow the app to Veto() this event? + SendEvent(enable ? wxEVT_GRID_EDITOR_SHOWN : wxEVT_GRID_EDITOR_HIDDEN); if ( enable ) { + // this should be checked by the caller! + wxASSERT_MSG( CanEnableCellControl(), + _T("can't enable editing for this cell!") ); + + // do it before ShowCellEditControl() m_cellEditCtrlEnabled = enable; + SetEditControlValue(); - // requires m_cellEditCtrlEnabled to be already true ShowCellEditControl(); } else { HideCellEditControl(); - // requires m_cellEditCtrlEnabled to be still true SaveEditControlValue(); + + // do it after HideCellEditControl() m_cellEditCtrlEnabled = enable; } } } +bool wxGrid::IsCurrentCellReadOnly() const +{ + // const_cast + wxGridCellAttr* attr = ((wxGrid *)this)->GetCellAttr(m_currentCellCoords); + bool readonly = attr->IsReadOnly(); + attr->DecRef(); + + return readonly; +} -void wxGrid::ShowCellEditControl() +bool wxGrid::CanEnableCellControl() const { - wxRect rect; + return m_editable && !IsCurrentCellReadOnly(); +} + +bool wxGrid::IsCellEditControlEnabled() const +{ + // the cell edit control might be disable for all cells or just for the + // current one if it's read only + return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE; +} + +wxWindow *wxGrid::GetGridWindow() const +{ + return m_gridWin; +} +void wxGrid::ShowCellEditControl() +{ if ( IsCellEditControlEnabled() ) { if ( !IsVisible( m_currentCellCoords ) ) @@ -4054,7 +4520,9 @@ void wxGrid::ShowCellEditControl() } else { - rect = CellToRect( m_currentCellCoords ); + wxRect rect = CellToRect( m_currentCellCoords ); + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); // convert to scrolled coords // @@ -4062,16 +4530,21 @@ void wxGrid::ShowCellEditControl() CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top ); CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom ); - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); + // cell is shifted by one pixel + left--; + top--; + right--; + bottom--; - // Make the edit control large enough to allow for internal margins - // TODO: remove this if the text ctrl sizing is improved esp. for unix + // Make the edit control large enough to allow for internal + // margins + // + // TODO: remove this if the text ctrl sizing is improved esp. for + // unix // int extra; #if defined(__WXMOTIF__) - if ( m_currentCellCoords.GetRow() == 0 || - m_currentCellCoords.GetCol() == 0 ) + if ( row == 0 || col == 0 ) { extra = 2; } @@ -4080,8 +4553,7 @@ void wxGrid::ShowCellEditControl() extra = 4; } #else - if ( m_currentCellCoords.GetRow() == 0 || - m_currentCellCoords.GetCol() == 0 ) + if ( row == 0 || col == 0 ) { extra = 1; } @@ -4107,33 +4579,19 @@ void wxGrid::ShowCellEditControl() rect.SetBottom( rect.GetBottom() + 2*extra ); #endif - m_cellEditCtrl->SetSize( rect ); - m_cellEditCtrl->Show( TRUE ); - - switch ( m_editCtrlType ) + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(); + if ( !editor->IsCreated() ) { - case wxGRID_TEXTCTRL: - ((wxTextCtrl *) m_cellEditCtrl)->SetInsertionPointEnd(); - break; - - case wxGRID_CHECKBOX: - // TODO: anything ??? - // - break; - - case wxGRID_CHOICE: - // TODO: anything ??? - // - break; - - case wxGRID_COMBOBOX: - // TODO: anything ??? - // - break; + editor->Create(m_gridWin, -1, + new wxGridCellEditorEvtHandler(this, editor)); } - m_cellEditCtrl->SetFocus(); - } + editor->SetSize( rect ); + editor->Show( TRUE, attr ); + editor->BeginEdit(row, col, this); + attr->DecRef(); + } } } @@ -4142,95 +4600,39 @@ void wxGrid::HideCellEditControl() { if ( IsCellEditControlEnabled() ) { - m_cellEditCtrl->Show( FALSE ); - SetFocus(); + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + + wxGridCellAttr* attr = GetCellAttr(row, col); + attr->GetEditor()->Show( FALSE ); + attr->DecRef(); + m_gridWin->SetFocus(); } } void wxGrid::SetEditControlValue( const wxString& value ) { - if ( m_table ) - { - wxString s; - if ( !value ) - s = GetCellValue(m_currentCellCoords); - else - s = value; - - if ( IsCellEditControlEnabled() ) - { - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - ((wxGridTextCtrl *)m_cellEditCtrl)->SetStartValue(s); - break; - - case wxGRID_CHECKBOX: - // TODO: implement this - // - break; - - case wxGRID_CHOICE: - // TODO: implement this - // - break; - - case wxGRID_COMBOBOX: - // TODO: implement this - // - break; - } - } - } + // RD: The new Editors get the value from the table themselves now. This + // method can probably be removed... } void wxGrid::SaveEditControlValue() { - if ( m_table ) + if ( IsCellEditControlEnabled() ) { - wxWindow *ctrl = (wxWindow *)NULL; - - if ( IsCellEditControlEnabled() ) - { - ctrl = m_cellEditCtrl; - } - else - { - return; - } - - bool valueChanged = FALSE; - - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - valueChanged = (((wxGridTextCtrl *)ctrl)->GetValue() != - ((wxGridTextCtrl *)ctrl)->GetStartValue()); - SetCellValue( m_currentCellCoords, - ((wxTextCtrl *) ctrl)->GetValue() ); - break; - - case wxGRID_CHECKBOX: - // TODO: implement this - // - break; + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - case wxGRID_CHOICE: - // TODO: implement this - // - break; + wxGridCellAttr* attr = GetCellAttr(row, col); + bool changed = attr->GetEditor()->EndEdit(row, col, TRUE, this); - case wxGRID_COMBOBOX: - // TODO: implement this - // - break; - } + attr->DecRef(); - if ( valueChanged ) + if (changed) { - SendEvent( EVT_GRID_CELL_CHANGE, + SendEvent( wxEVT_GRID_CELL_CHANGE, m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol() ); } @@ -4270,7 +4672,7 @@ int wxGrid::YToRow( int y ) if ( y < m_rowBottoms[i] ) return i; } - return -1; + return m_numRows; //-1; } @@ -4283,7 +4685,7 @@ int wxGrid::XToCol( int x ) if ( x < m_colRights[i] ) return i; } - return -1; + return m_numCols; //-1; } @@ -5118,6 +5520,11 @@ void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) m_defaultCellAttr->SetRenderer(renderer); } +void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) +{ + m_defaultCellAttr->SetEditor(editor); +} + // ---------------------------------------------------------------------------- // access to the default attrbiutes // ---------------------------------------------------------------------------- @@ -5147,6 +5554,11 @@ wxGridCellRenderer *wxGrid::GetDefaultRenderer() const return m_defaultCellAttr->GetRenderer(); } +wxGridCellEditor *wxGrid::GetDefaultEditor() const +{ + return m_defaultCellAttr->GetEditor(); +} + // ---------------------------------------------------------------------------- // access to cell attributes // ---------------------------------------------------------------------------- @@ -5190,6 +5602,22 @@ wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) return renderer; } +wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(); + attr->DecRef(); + return editor; +} + +bool wxGrid::IsReadOnly(int row, int col) const +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + bool isReadOnly = attr->IsReadOnly(); + attr->DecRef(); + return isReadOnly; +} + // ---------------------------------------------------------------------------- // attribute support: cache, automatic provider creation, ... // ---------------------------------------------------------------------------- @@ -5266,9 +5694,12 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL; CacheAttr(row, col, attr); } - if (attr) { + if (attr) + { attr->SetDefAttr(m_defaultCellAttr); - } else { + } + else + { attr = m_defaultCellAttr; attr->IncRef(); } @@ -5380,6 +5811,26 @@ void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) } } +void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetEditor(editor); + attr->DecRef(); + } +} + +void wxGrid::SetReadOnly(int row, int col, bool isReadOnly) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetReadOnly(isReadOnly); + attr->DecRef(); + } +} + // ---------------------------------------------------------------------------- // row/col size // ---------------------------------------------------------------------------- @@ -5558,7 +6009,7 @@ void wxGrid::SelectRow( int row, bool addToSelected ) } wxGridRangeSelectEvent gridEvt( GetId(), - EVT_GRID_RANGE_SELECT, + wxEVT_GRID_RANGE_SELECT, this, m_selectedTopLeft, m_selectedBottomRight ); @@ -5636,7 +6087,7 @@ void wxGrid::SelectCol( int col, bool addToSelected ) } wxGridRangeSelectEvent gridEvt( GetId(), - EVT_GRID_RANGE_SELECT, + wxEVT_GRID_RANGE_SELECT, this, m_selectedTopLeft, m_selectedBottomRight ); @@ -5766,7 +6217,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) if ( !m_isDragging ) { wxGridRangeSelectEvent gridEvt( GetId(), - EVT_GRID_RANGE_SELECT, + wxEVT_GRID_RANGE_SELECT, this, m_selectedTopLeft, m_selectedBottomRight );