X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb5df486e8cd118656501b51206ee9a8c8f94361..1265b12ac90866b6a99502924c24ea85f4fa826e:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index dd097a54f5..cbdb0110ac 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -1,4 +1,4 @@ -///////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// // Name: grid.cpp // Purpose: wxGrid and related classes // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) @@ -9,6 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "grid.h" #endif @@ -33,22 +41,31 @@ #include "wx/log.h" #endif +// this include needs to be outside precomp for BCC #include "wx/textfile.h" + #include "wx/generic/grid.h" // ---------------------------------------------------------------------------- -// array classes instantiation +// array classes // ---------------------------------------------------------------------------- +WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs); + struct wxGridCellWithAttr { - wxGridCellWithAttr(int row, int col, const wxGridCellAttr *pAttr) - : coords(row, col), attr(*pAttr) + wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_) + : coords(row, col), attr(attr_) + { + } + + ~wxGridCellWithAttr() { + attr->DecRef(); } wxGridCellCoords coords; - wxGridCellAttr attr; + wxGridCellAttr *attr; }; WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); @@ -144,18 +161,51 @@ private: void OnPaint( wxPaintEvent &event ); void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& ); + void OnEraseBackground( wxEraseEvent& ); + DECLARE_DYNAMIC_CLASS(wxGridWindow) DECLARE_EVENT_TABLE() }; + + +class wxGridCellEditorEvtHandler : public wxEvtHandler +{ +public: + wxGridCellEditorEvtHandler() + : m_grid(0), m_editor(0) + { } + wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor) + : m_grid(grid), m_editor(editor) + { } + + void OnKeyDown(wxKeyEvent& event); + +private: + wxGrid* m_grid; + wxGridCellEditor* m_editor; + DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler) + DECLARE_EVENT_TABLE() +}; + + +IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler ) +BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler ) + EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown ) +END_EVENT_TABLE() + + + +// ---------------------------------------------------------------------------- // the internal data representation used by wxGridCellAttrProvider -// -// TODO make it more efficient -class WXDLLEXPORT wxGridCellAttrProviderData +// ---------------------------------------------------------------------------- + +// this class stores attributes set for cells +class WXDLLEXPORT wxGridCellAttrData { public: - void SetAttr(const wxGridCellAttr *attr, int row, int col); + void SetAttr(wxGridCellAttr *attr, int row, int col); wxGridCellAttr *GetAttr(int row, int col) const; private: @@ -165,6 +215,30 @@ private: wxGridCellWithAttrArray m_attrs; }; +// this class stores attributes set for rows or columns +class WXDLLEXPORT wxGridRowOrColAttrData +{ +public: + ~wxGridRowOrColAttrData(); + + void SetAttr(wxGridCellAttr *attr, int rowOrCol); + wxGridCellAttr *GetAttr(int rowOrCol) const; + +private: + wxArrayInt m_rowsOrCols; + wxArrayAttrs m_attrs; +}; + +// NB: this is just a wrapper around 3 objects: one which stores cell +// attributes, and 2 others for row/col ones +class WXDLLEXPORT wxGridCellAttrProviderData +{ +public: + wxGridCellAttrData m_cellAttrs; + wxGridRowOrColAttrData m_rowAttrs, + m_colAttrs; +}; + // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -173,7 +247,15 @@ private: #define WXGRID_DRAW_LINES 1 #endif -////////////////////////////////////////////////////////////////////// +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +//#define DEBUG_ATTR_CACHE +#ifdef DEBUG_ATTR_CACHE + static size_t gs_nAttrCacheHits = 0; + static size_t gs_nAttrCacheMisses = 0; +#endif // DEBUG_ATTR_CACHE wxGridCellCoords wxGridNoCellCoords( -1, -1 ); wxRect wxGridNoCellRect( -1, -1, -1, -1 ); @@ -182,12 +264,314 @@ wxRect wxGridNoCellRect( -1, -1, -1, -1 ); // TODO: fixed so far - make configurable later (and also different for x/y) static const size_t GRID_SCROLL_LINE = 10; +// ============================================================================ +// implementation +// ============================================================================ + + +// ---------------------------------------------------------------------------- +// wxGridCellEditor +// ---------------------------------------------------------------------------- + +wxGridCellEditor::wxGridCellEditor() +{ + m_control = NULL; +} + + +wxGridCellEditor::~wxGridCellEditor() +{ + Destroy(); +} + + +void wxGridCellEditor::Destroy() +{ + if (m_control) { + m_control->Destroy(); + m_control = NULL; + } +} + +void wxGridCellEditor::Show(bool show) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + m_control->Show(show); +} + +void wxGridCellEditor::SetSize(const wxRect& rect) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + m_control->SetSize(rect); +} + +void wxGridCellEditor::HandleReturn(wxKeyEvent& event) +{ + event.Skip(); +} + + +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 +#if defined(__WXMSW__) + , wxTE_MULTILINE | wxTE_NO_VSCROLL +#endif + ); + + if (evtHandler) + m_control->PushEventHandler(evtHandler); +} + + +void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid, + wxGridCellAttr* attr) +{ + 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? +} + + + +bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue, + wxGrid* grid, wxGridCellAttr* attr) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + bool changed = FALSE; + wxString value = ((wxTextCtrl*)m_control)->GetValue(); + if (value != m_startValue) + changed = TRUE; + + if (changed) + grid->GetTable()->SetValue(row, col, value); + m_startValue = ""; + + return changed; +} + + +void wxGridCellTextEditor::Reset() +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + ((wxTextCtrl*)m_control)->SetValue(m_startValue); + ((wxTextCtrl*)m_control)->SetInsertionPointEnd(); +} + +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() ); + s = s.Left(pos) + "\n" + s.Mid(pos); + ((wxTextCtrl*)m_control)->SetValue(s); + ((wxTextCtrl*)m_control)->SetInsertionPoint( pos ); +#else + // the other ports can handle a Return key press + // + event.Skip(); +#endif +} + + +void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) +{ + switch ( event.KeyCode() ) + { + case WXK_ESCAPE: + m_editor->Reset(); + 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 + // + event.Skip( m_grid->ProcessEvent( event ) ); + break; + + case WXK_RETURN: + if (!m_grid->ProcessEvent(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 ) ); + break; + + default: + event.Skip(); + } +} + // ---------------------------------------------------------------------------- -// wxGridCellAttrProviderData +// wxGridCellRenderer // ---------------------------------------------------------------------------- -void wxGridCellAttrProviderData::SetAttr(const wxGridCellAttr *attr, - int row, int col) +void wxGridCellRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rect, + int row, int col, + bool isSelected) +{ + dc.SetBackgroundMode( wxSOLID ); + + if ( isSelected ) + { + dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); + } + else + { + dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); + } + + dc.SetPen( *wxTRANSPARENT_PEN ); + + dc.DrawRectangle(rect); +} + +void wxGridCellStringRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rectCell, + int row, int col, + bool isSelected) +{ + wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); + + // now we only have to draw the text + dc.SetBackgroundMode( wxTRANSPARENT ); + + if ( isSelected ) + { + dc.SetTextBackground( grid.GetSelectionBackground() ); + dc.SetTextForeground( grid.GetSelectionForeground() ); + } + else + { + dc.SetTextBackground( attr.GetBackgroundColour() ); + dc.SetTextForeground( attr.GetTextColour() ); + } + dc.SetFont( attr.GetFont() ); + + int hAlign, vAlign; + attr.GetAlignment(&hAlign, &vAlign); + + wxRect rect = rectCell; + rect.x++; + rect.y++; + rect.width -= 2; + rect.height -= 2; + + grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), + rect, hAlign, vAlign); +} + +// ---------------------------------------------------------------------------- +// wxGridCellAttr +// ---------------------------------------------------------------------------- + +const wxColour& wxGridCellAttr::GetTextColour() const +{ + if (HasTextColour()) + return m_colText; + else if (m_defGridAttr != this) + return m_defGridAttr->GetTextColour(); + else { + wxFAIL_MSG(wxT("Missing default cell attribute")); + return wxNullColour; + } +} + + +const wxColour& wxGridCellAttr::GetBackgroundColour() const +{ + if (HasBackgroundColour()) + return m_colBack; + else if (m_defGridAttr != this) + return m_defGridAttr->GetBackgroundColour(); + else { + wxFAIL_MSG(wxT("Missing default cell attribute")); + return wxNullColour; + } +} + + +const wxFont& wxGridCellAttr::GetFont() const +{ + if (HasFont()) + return m_font; + else if (m_defGridAttr != this) + return m_defGridAttr->GetFont(); + else { + wxFAIL_MSG(wxT("Missing default cell attribute")); + return wxNullFont; + } +} + + +void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const +{ + if (HasAlignment()) { + if ( hAlign ) *hAlign = m_hAlign; + if ( vAlign ) *vAlign = m_vAlign; + } + else if (m_defGridAttr != this) + m_defGridAttr->GetAlignment(hAlign, vAlign); + else { + wxFAIL_MSG(wxT("Missing default cell attribute")); + } +} + + +wxGridCellRenderer* wxGridCellAttr::GetRenderer() const +{ + if (HasRenderer()) + return m_renderer; + else if (m_defGridAttr != this) + return m_defGridAttr->GetRenderer(); + else { + wxFAIL_MSG(wxT("Missing default cell attribute")); + return NULL; + } +} + +// ---------------------------------------------------------------------------- +// wxGridCellAttrData +// ---------------------------------------------------------------------------- + +void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col) { int n = FindIndex(row, col); if ( n == wxNOT_FOUND ) @@ -200,7 +584,7 @@ void wxGridCellAttrProviderData::SetAttr(const wxGridCellAttr *attr, if ( attr ) { // change the attribute - m_attrs[(size_t)n].attr = *attr; + m_attrs[(size_t)n].attr = attr; } else { @@ -208,24 +592,23 @@ void wxGridCellAttrProviderData::SetAttr(const wxGridCellAttr *attr, m_attrs.RemoveAt((size_t)n); } } - - delete attr; } -wxGridCellAttr *wxGridCellAttrProviderData::GetAttr(int row, int col) const +wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const { wxGridCellAttr *attr = (wxGridCellAttr *)NULL; int n = FindIndex(row, col); if ( n != wxNOT_FOUND ) { - attr = new wxGridCellAttr(m_attrs[(size_t)n].attr); + attr = m_attrs[(size_t)n].attr; + attr->IncRef(); } return attr; } -int wxGridCellAttrProviderData::FindIndex(int row, int col) const +int wxGridCellAttrData::FindIndex(int row, int col) const { size_t count = m_attrs.GetCount(); for ( size_t n = 0; n < count; n++ ) @@ -240,6 +623,59 @@ int wxGridCellAttrProviderData::FindIndex(int row, int col) const return wxNOT_FOUND; } +// ---------------------------------------------------------------------------- +// wxGridRowOrColAttrData +// ---------------------------------------------------------------------------- + +wxGridRowOrColAttrData::~wxGridRowOrColAttrData() +{ + size_t count = m_attrs.Count(); + for ( size_t n = 0; n < count; n++ ) + { + m_attrs[n]->DecRef(); + } +} + +wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const +{ + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + + int n = m_rowsOrCols.Index(rowOrCol); + if ( n != wxNOT_FOUND ) + { + attr = m_attrs[(size_t)n]; + attr->IncRef(); + } + + return attr; +} + +void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol) +{ + int n = m_rowsOrCols.Index(rowOrCol); + if ( n == wxNOT_FOUND ) + { + // add the attribute + m_rowsOrCols.Add(rowOrCol); + m_attrs.Add(attr); + } + else + { + if ( attr ) + { + // change the attribute + m_attrs[(size_t)n] = attr; + } + else + { + // remove this attribute + m_attrs[(size_t)n]->DecRef(); + m_rowsOrCols.RemoveAt((size_t)n); + m_attrs.RemoveAt((size_t)n); + } + } +} + // ---------------------------------------------------------------------------- // wxGridCellAttrProvider // ---------------------------------------------------------------------------- @@ -261,18 +697,58 @@ void wxGridCellAttrProvider::InitData() wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const { - return m_data ? m_data->GetAttr(row, col) : (wxGridCellAttr *)NULL; + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + if ( m_data ) + { + // first look for the attribute of this specific cell + attr = m_data->m_cellAttrs.GetAttr(row, col); + + if ( !attr ) + { + // then look for the col attr (col attributes are more common than + // the row ones, hence they have priority) + attr = m_data->m_colAttrs.GetAttr(col); + } + + if ( !attr ) + { + // finally try the row attributes + attr = m_data->m_rowAttrs.GetAttr(row); + } + } + + return attr; } -void wxGridCellAttrProvider::SetAttr(const wxGridCellAttr *attr, +void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr, int row, int col) { if ( !m_data ) InitData(); - m_data->SetAttr(attr, row, col); + m_data->m_cellAttrs.SetAttr(attr, row, col); +} + +void wxGridCellAttrProvider::SetRowAttr(wxGridCellAttr *attr, int row) +{ + if ( !m_data ) + InitData(); + + m_data->m_rowAttrs.SetAttr(attr, row); +} + +void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col) +{ + if ( !m_data ) + InitData(); + + m_data->m_colAttrs.SetAttr(attr, col); } +// ---------------------------------------------------------------------------- +// wxGridTableBase +// ---------------------------------------------------------------------------- + ////////////////////////////////////////////////////////////////////// // // Abstract base class for grid data (the model) @@ -305,7 +781,7 @@ wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col) return (wxGridCellAttr *)NULL; } -void wxGridTableBase::SetAttr(const wxGridCellAttr *attr, int row, int col ) +void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) { if ( m_attrProvider ) { @@ -315,7 +791,35 @@ void wxGridTableBase::SetAttr(const wxGridCellAttr *attr, int row, int col ) { // as we take ownership of the pointer and don't store it, we must // free it now - delete attr; + attr->SafeDecRef(); + } +} + +void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row) +{ + if ( m_attrProvider ) + { + m_attrProvider->SetRowAttr(attr, row); + } + else + { + // as we take ownership of the pointer and don't store it, we must + // free it now + attr->SafeDecRef(); + } +} + +void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col) +{ + if ( m_attrProvider ) + { + m_attrProvider->SetColAttr(attr, col); + } + else + { + // as we take ownership of the pointer and don't store it, we must + // free it now + attr->SafeDecRef(); } } @@ -1093,6 +1597,7 @@ BEGIN_EVENT_TABLE( wxGridWindow, wxPanel ) EVT_PAINT( wxGridWindow::OnPaint ) EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridWindow::OnKeyDown ) + EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground ) END_EVENT_TABLE() wxGridWindow::wxGridWindow( wxGrid *parent, @@ -1149,6 +1654,9 @@ void wxGridWindow::OnKeyDown( wxKeyEvent& event ) if ( !m_owner->ProcessEvent( event ) ) event.Skip(); } +void wxGridWindow::OnEraseBackground(wxEraseEvent&) +{ } + ////////////////////////////////////////////////////////////////////// @@ -1159,6 +1667,7 @@ BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow ) EVT_PAINT( wxGrid::OnPaint ) EVT_SIZE( wxGrid::OnSize ) EVT_KEY_DOWN( wxGrid::OnKeyDown ) + EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground ) END_EVENT_TABLE() wxGrid::wxGrid( wxWindow *parent, @@ -1175,7 +1684,19 @@ wxGrid::wxGrid( wxWindow *parent, wxGrid::~wxGrid() { - delete m_table; + ClearAttrCache(); + m_defaultCellAttr->SafeDecRef(); + +#ifdef DEBUG_ATTR_CACHE + size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses; + wxPrintf(_T("wxGrid attribute cache statistics: " + "total: %u, hits: %u (%u%%)\n"), + total, gs_nAttrCacheHits, + total ? (gs_nAttrCacheHits*100) / total : 0); +#endif + + if (m_ownTable) + delete m_table; } @@ -1189,8 +1710,14 @@ void wxGrid::Create() m_displayed = FALSE; // set to TRUE by OnPaint m_table = (wxGridTableBase *) NULL; + m_ownTable = FALSE; m_cellEditCtrl = (wxWindow *) NULL; + m_defaultCellAttr = new wxGridCellAttr; + m_defaultCellAttr->SetDefAttr(m_defaultCellAttr); + // RD: Should we fill the default attrs now or is waiting until Init() okay? + + m_numRows = 0; m_numCols = 0; m_currentCellCoords = wxGridNoCellCoords; @@ -1228,7 +1755,7 @@ bool wxGrid::CreateGrid( int numRows, int numCols ) { if ( m_created ) { - wxFAIL_MSG( wxT("wxGrid::CreateGrid called more than once") ); + wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); return FALSE; } else @@ -1238,6 +1765,30 @@ bool wxGrid::CreateGrid( int numRows, int numCols ) m_table = new wxGridStringTable( m_numRows, m_numCols ); m_table->SetView( this ); + m_ownTable = TRUE; + Init(); + m_created = TRUE; + } + + return m_created; +} + +bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership ) +{ + if ( m_created ) + { + wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); + return FALSE; + } + else + { + m_numRows = table->GetNumberRows(); + m_numCols = table->GetNumberCols(); + + m_table = table; + m_table->SetView( this ); + if (takeOwnership) + m_ownTable = TRUE; Init(); m_created = TRUE; } @@ -1270,6 +1821,9 @@ void wxGrid::Init() m_labelTextColour = wxColour( _T("BLACK") ); + // init attr cache + m_attrCache.row = -1; + // TODO: something better than this ? // m_labelFont = this->GetFont(); @@ -1310,17 +1864,20 @@ void wxGrid::Init() m_colRights.Add( colRight ); } - // TODO: improve this by using wxSystemSettings? - // - m_defaultCellFont = GetFont(); + m_defaultCellAttr->SetFont(GetFont()); + m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP); + m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer); + m_defaultCellAttr->SetTextColour( + wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT)); + m_defaultCellAttr->SetBackgroundColour( + wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); - m_defaultCellHAlign = wxLEFT; - m_defaultCellVAlign = wxTOP; m_gridLineColour = wxColour( 128, 128, 255 ); m_gridLinesEnabled = TRUE; m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + m_winCapture = (wxWindow *)NULL; m_dragLastPos = -1; m_dragRowOrCol = -1; m_isDragging = FALSE; @@ -1332,6 +1889,8 @@ void wxGrid::Init() m_selectedTopLeft = wxGridNoCellCoords; m_selectedBottomRight = wxGridNoCellCoords; + m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); + m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT); m_editable = TRUE; // default for whole grid @@ -1771,14 +2330,16 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_ROW: - { if ( (row = YToRow( y )) >= 0 && !IsInSelection( row, 0 ) ) { SelectRow( row, TRUE ); } - } - break; + + // default label to suppress warnings about "enumeration value + // 'xxx' not handled in switch + default: + break; } } return; @@ -1787,9 +2348,17 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) m_isDragging = FALSE; + // ------------ Entering or leaving the window + // + if ( event.Entering() || event.Leaving() ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); + } + + // ------------ Left button pressed // - if ( event.LeftDown() ) + else if ( event.LeftDown() ) { // don't send a label click event for a hit on the // edge of the row label - this is probably the user @@ -1802,14 +2371,14 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) { SelectRow( row, event.ShiftDown() ); - m_cursorMode = WXGRID_CURSOR_SELECT_ROW; + ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin); } } else { // starting to drag-resize a row // - m_rowLabelWin->CaptureMouse(); + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin); } } @@ -1832,48 +2401,16 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) { - m_rowLabelWin->ReleaseMouse(); - - if ( m_dragLastPos >= 0 ) - { - // erase the last line and resize the row - // - int cw, ch, left, dummy; - m_gridWin->GetClientSize( &cw, &ch ); - CalcUnscrolledPosition( 0, 0, &left, &dummy ); - - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - dc.SetLogicalFunction( wxINVERT ); - dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); - HideCellEditControl(); - - int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol]; - SetRowSize( m_dragRowOrCol, wxMax( y - rowTop, WXGRID_MIN_ROW_HEIGHT ) ); - if ( !GetBatchCount() ) - { - // Only needed to get the correct rect.y: - wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) ); - rect.x = 0; - CalcScrolledPosition(0, rect.y, &dummy, &rect.y); - rect.width = m_rowLabelWidth; - rect.height = ch - rect.y; - m_rowLabelWin->Refresh( TRUE, &rect ); - rect.width = cw; - m_gridWin->Refresh( FALSE, &rect ); - } - - ShowCellEditControl(); + DoEndDragResizeRow(); - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); - } + // Note: we are ending the event *after* doing + // default processing in this case + // + SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); } - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - m_dragLastPos = -1; + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); + m_dragLastPos = -1; } @@ -1910,15 +2447,13 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - m_cursorMode = WXGRID_CURSOR_RESIZE_ROW; - m_rowLabelWin->SetCursor( m_rowResizeCursor ); + // don't capture the mouse yet + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE); } } - else + else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - if ( m_rowLabelWin->GetCursor() == m_rowResizeCursor ) - m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR ); + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, FALSE); } } } @@ -1957,14 +2492,16 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_COL: - { if ( (col = XToCol( x )) >= 0 && !IsInSelection( 0, col ) ) { SelectCol( col, TRUE ); } - } - break; + + // default label to suppress warnings about "enumeration value + // 'xxx' not handled in switch + default: + break; } } return; @@ -1973,9 +2510,17 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) m_isDragging = FALSE; + // ------------ Entering or leaving the window + // + if ( event.Entering() || event.Leaving() ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); + } + + // ------------ Left button pressed // - if ( event.LeftDown() ) + else if ( event.LeftDown() ) { // don't send a label click event for a hit on the // edge of the col label - this is probably the user @@ -1988,14 +2533,14 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) { SelectCol( col, event.ShiftDown() ); - m_cursorMode = WXGRID_CURSOR_SELECT_COL; + ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin); } } else { // starting to drag-resize a col // - m_colLabelWin->CaptureMouse(); + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin); } } @@ -2018,48 +2563,15 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) { - m_colLabelWin->ReleaseMouse(); - - if ( m_dragLastPos >= 0 ) - { - // erase the last line and resize the col - // - int cw, ch, dummy, top; - m_gridWin->GetClientSize( &cw, &ch ); - CalcUnscrolledPosition( 0, 0, &dummy, &top ); - - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - dc.SetLogicalFunction( wxINVERT ); - dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); - HideCellEditControl(); - - int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol]; - SetColSize( m_dragRowOrCol, wxMax( x - colLeft, WXGRID_MIN_COL_WIDTH ) ); - - if ( !GetBatchCount() ) - { - // Only needed to get the correct rect.x: - wxRect rect ( CellToRect( 0, m_dragRowOrCol ) ); - rect.y = 0; - CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); - rect.width = cw - rect.x; - rect.height = m_colLabelHeight; - m_colLabelWin->Refresh( TRUE, &rect ); - rect.height = ch; - m_gridWin->Refresh( FALSE, &rect ); - } + DoEndDragResizeCol(); - ShowCellEditControl(); - - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); - } + // Note: we are ending the event *after* doing + // default processing in this case + // + SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); } - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); m_dragLastPos = -1; } @@ -2097,15 +2609,13 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - m_cursorMode = WXGRID_CURSOR_RESIZE_COL; - m_colLabelWin->SetCursor( m_colResizeCursor ); + // don't capture the cursor yet + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE); } } - else + else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - if ( m_colLabelWin->GetCursor() == m_colResizeCursor ) - m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR ); + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, FALSE); } } } @@ -2146,6 +2656,69 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) } } +void wxGrid::ChangeCursorMode(CursorMode mode, + wxWindow *win, + bool captureMouse) +{ +#ifdef __WXDEBUG__ + static const wxChar *cursorModes[] = + { + _T("SELECT_CELL"), + _T("RESIZE_ROW"), + _T("RESIZE_COL"), + _T("SELECT_ROW"), + _T("SELECT_COL") + }; + + wxLogTrace(_T("grid"), + _T("wxGrid cursor mode (mouse capture for %s): %s -> %s"), + win == m_colLabelWin ? _T("colLabelWin") + : win ? _T("rowLabelWin") + : _T("gridWin"), + cursorModes[m_cursorMode], cursorModes[mode]); +#endif // __WXDEBUG__ + + if ( mode == m_cursorMode ) + return; + + if ( !win ) + { + // by default use the grid itself + win = m_gridWin; + } + + if ( m_winCapture ) + { + m_winCapture->ReleaseMouse(); + m_winCapture = (wxWindow *)NULL; + } + + m_cursorMode = mode; + + switch ( m_cursorMode ) + { + case WXGRID_CURSOR_RESIZE_ROW: + win->SetCursor( m_rowResizeCursor ); + break; + + case WXGRID_CURSOR_RESIZE_COL: + win->SetCursor( m_colResizeCursor ); + break; + + default: + win->SetCursor( *wxSTANDARD_CURSOR ); + } + + // we need to capture mouse when resizing + bool resize = m_cursorMode == WXGRID_CURSOR_RESIZE_ROW || + m_cursorMode == WXGRID_CURSOR_RESIZE_COL; + + if ( captureMouse && resize ) + { + win->CaptureMouse(); + m_winCapture = win; + } +} void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { @@ -2177,6 +2750,38 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) } } } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) + { + int cw, ch, left, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &left, &dummy ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction(wxINVERT); + if ( m_dragLastPos >= 0 ) + { + dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); + } + dc.DrawLine( left, y, left+cw, y ); + m_dragLastPos = y; + } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) + { + int cw, ch, dummy, top; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &dummy, &top ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction(wxINVERT); + if ( m_dragLastPos >= 0 ) + { + dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); + } + dc.DrawLine( x, top, x, top+ch ); + m_dragLastPos = x; + } return; } @@ -2185,13 +2790,28 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( coords != wxGridNoCellCoords ) { + // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL + // immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under + // wxGTK +#if 0 + if ( event.Entering() || event.Leaving() ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + m_gridWin->SetCursor( *wxSTANDARD_CURSOR ); + } + else +#endif // 0 + + // ------------ Left button pressed + // if ( event.LeftDown() ) { if ( event.ShiftDown() ) { SelectBlock( m_currentCellCoords, coords ); } - else + else if ( XToEdgeOfCol(x) < 0 && + YToEdgeOfRow(y) < 0 ) { if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK, coords.GetRow(), @@ -2209,10 +2829,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.LeftDClick() ) { - SendEvent( EVT_GRID_CELL_LEFT_DCLICK, - coords.GetRow(), - coords.GetCol(), - event ); + if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) + { + SendEvent( EVT_GRID_CELL_LEFT_DCLICK, + coords.GetRow(), + coords.GetCol(), + event ); + } } @@ -2226,12 +2849,32 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event ); } + + // Show the edit control, if it has + // been hidden for drag-shrinking. + if ( IsCellEditControlEnabled() ) + ShowCellEditControl(); } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + DoEndDragResizeRow(); - // Show the edit control, if it has - // been hidden for drag-shrinking. - if ( IsCellEditControlEnabled() ) - ShowCellEditControl(); + // Note: we are ending the event *after* doing + // default processing in this case + // + SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); + } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + DoEndDragResizeCol(); + + // Note: we are ending the event *after* doing + // default processing in this case + // + SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); + } m_dragLastPos = -1; } @@ -2268,12 +2911,130 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.Moving() && !event.IsButton() ) { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + int dragRow = YToEdgeOfRow( y ); + int dragCol = XToEdgeOfCol( x ); + + // Dragging on the corner of a cell to resize in both + // directions is not implemented yet... + // + if ( dragRow >= 0 && dragCol >= 0 ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + return; + } + + if ( dragRow >= 0 ) + { + m_dragRowOrCol = dragRow; + + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) + { + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW); + } + + return; + } + + if ( dragCol >= 0 ) + { + m_dragRowOrCol = dragCol; + + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) + { + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL); + } + + return; + } + + // Neither on a row or col edge + // + if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + } + } + } +} + + +void wxGrid::DoEndDragResizeRow() +{ + if ( m_dragLastPos >= 0 ) + { + // erase the last line and resize the row + // + int cw, ch, left, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &left, &dummy ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction( wxINVERT ); + dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); + HideCellEditControl(); + + int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol]; + SetRowSize( m_dragRowOrCol, + wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) ); + + if ( !GetBatchCount() ) + { + // Only needed to get the correct rect.y: + wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) ); + rect.x = 0; + CalcScrolledPosition(0, rect.y, &dummy, &rect.y); + rect.width = m_rowLabelWidth; + rect.height = ch - rect.y; + m_rowLabelWin->Refresh( TRUE, &rect ); + rect.width = cw; + m_gridWin->Refresh( FALSE, &rect ); + } + + ShowCellEditControl(); + } +} + + +void wxGrid::DoEndDragResizeCol() +{ + if ( m_dragLastPos >= 0 ) + { + // erase the last line and resize the col + // + int cw, ch, dummy, top; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &dummy, &top ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction( wxINVERT ); + dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); + HideCellEditControl(); + + int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol]; + SetColSize( m_dragRowOrCol, + wxMax( m_dragLastPos - colLeft, WXGRID_MIN_COL_WIDTH ) ); + + if ( !GetBatchCount() ) + { + // Only needed to get the correct rect.x: + wxRect rect ( CellToRect( 0, m_dragRowOrCol ) ); + rect.y = 0; + CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); + rect.width = cw - rect.x; + rect.height = m_colLabelHeight; + m_colLabelWin->Refresh( TRUE, &rect ); + rect.height = ch; + m_gridWin->Refresh( FALSE, &rect ); } + + ShowCellEditControl(); } } + // // ------ interaction with data model // @@ -2793,6 +3554,8 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) m_inOnKeyDown = FALSE; } +void wxGrid::OnEraseBackground(wxEraseEvent&) +{ } void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) { @@ -2887,23 +3650,31 @@ void wxGrid::DrawGridCellArea( wxDC& dc ) void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) { - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; + int row = coords.GetRow(); + int col = coords.GetCol(); + if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 ) + return; + + // we draw the cell border ourselves #if !WXGRID_DRAW_LINES if ( m_gridLinesEnabled ) DrawCellBorder( dc, coords ); #endif - DrawCellBackground( dc, coords ); + // 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] + 1; + rect.y = m_rowBottoms[row] - m_rowHeights[row] + 1; + rect.width = m_colWidths[col] - 1; + rect.height = m_rowHeights[row] - 1; - // TODO: separate functions here for different kinds of cells ? - // e.g. text, image - // - DrawCellValue( dc, coords ); + wxGridCellAttr* attr = GetCellAttr(row, col); + attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords)); + attr->DecRef(); } - void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) { if ( m_colWidths[coords.GetCol()] <=0 || @@ -2913,86 +3684,18 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) int row = coords.GetRow(); int col = coords.GetCol(); - // right hand border - // - dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row], - m_colRights[col], m_rowBottoms[row] ); - - // bottom border - // - dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row], - m_colRights[col], m_rowBottoms[row] ); -} - - -void wxGrid::DrawCellBackground( wxDC& dc, const wxGridCellCoords& coords ) -{ - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; - - int row = coords.GetRow(); - int col = coords.GetCol(); - - dc.SetBackgroundMode( wxSOLID ); - - if ( IsInSelection( coords ) ) - { - // TODO: improve this - // - dc.SetBrush( *wxBLACK_BRUSH ); - } - else - { - dc.SetBrush( wxBrush(GetCellBackgroundColour(row, col), wxSOLID) ); - } - - dc.SetPen( *wxTRANSPARENT_PEN ); - - dc.DrawRectangle( m_colRights[col] - m_colWidths[col] + 1, - m_rowBottoms[row] - m_rowHeights[row] + 1, - m_colWidths[col]-1, - m_rowHeights[row]-1 ); -} - - -void wxGrid::DrawCellValue( wxDC& dc, const wxGridCellCoords& coords ) -{ - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; - - int row = coords.GetRow(); - int col = coords.GetCol(); - - dc.SetBackgroundMode( wxTRANSPARENT ); - - if ( IsInSelection( row, col ) ) - { - // TODO: improve this - // - dc.SetTextBackground( wxColour(0, 0, 0) ); - dc.SetTextForeground( wxColour(255, 255, 255) ); - } - else - { - dc.SetTextBackground( GetCellBackgroundColour(row, col) ); - dc.SetTextForeground( GetCellTextColour(row, col) ); - } - dc.SetFont( GetCellFont(row, col) ); - - int hAlign, vAlign; - GetCellAlignment( row, col, &hAlign, &vAlign ); - - wxRect rect; - rect.SetX( m_colRights[col] - m_colWidths[col] + 2 ); - rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 ); - rect.SetWidth( m_colWidths[col] - 4 ); - rect.SetHeight( m_rowHeights[row] - 4 ); + // right hand border + // + dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row], + m_colRights[col], m_rowBottoms[row] ); - DrawTextRectangle( dc, GetCellValue( row, col ), rect, hAlign, vAlign ); + // bottom border + // + dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row], + m_colRights[col], m_rowBottoms[row] ); } - // TODO: remove this ??? // This is used to redraw all grid lines e.g. when the grid line colour // has been changed @@ -3226,10 +3929,9 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) { int startPos = 0; int pos; - wxTextFile tf; - wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix ); + wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix ); wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix ); - + while ( startPos < (int)tVal.Length() ) { pos = tVal.Mid(startPos).Find( eol ); @@ -4362,89 +5064,306 @@ int wxGrid::GetColSize( int col ) return m_colWidths[col]; } -wxColour wxGrid::GetDefaultCellBackgroundColour() +// ============================================================================ +// access to the grid attributes: each of them has a default value in the grid +// itself and may be overidden on a per-cell basis +// ============================================================================ + +// ---------------------------------------------------------------------------- +// setting default attributes +// ---------------------------------------------------------------------------- + +void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col ) +{ + m_defaultCellAttr->SetBackgroundColour(col); +} + +void wxGrid::SetDefaultCellTextColour( const wxColour& col ) { - return m_gridWin->GetBackgroundColour(); + m_defaultCellAttr->SetTextColour(col); } -// TODO VZ: this must be optimized to allow only retrieveing attr once! +void wxGrid::SetDefaultCellAlignment( int horiz, int vert ) +{ + m_defaultCellAttr->SetAlignment(horiz, vert); +} -wxColour wxGrid::GetCellBackgroundColour(int row, int col) +void wxGrid::SetDefaultCellFont( const wxFont& font ) { - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; + m_defaultCellAttr->SetFont(font); +} - wxColour colour; - if ( attr && attr->HasBackgroundColour() ) - colour = attr->GetBackgroundColour(); - else - colour = GetDefaultCellBackgroundColour(); +void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) +{ + m_defaultCellAttr->SetRenderer(renderer); +} - delete attr; +// ---------------------------------------------------------------------------- +// access to the default attrbiutes +// ---------------------------------------------------------------------------- - return colour; +wxColour wxGrid::GetDefaultCellBackgroundColour() +{ + return m_defaultCellAttr->GetBackgroundColour(); } wxColour wxGrid::GetDefaultCellTextColour() { - return m_gridWin->GetForegroundColour(); + return m_defaultCellAttr->GetTextColour(); } -wxColour wxGrid::GetCellTextColour( int row, int col ) +wxFont wxGrid::GetDefaultCellFont() { - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; + return m_defaultCellAttr->GetFont(); +} - wxColour colour; - if ( attr && attr->HasTextColour() ) - colour = attr->GetTextColour(); - else - colour = GetDefaultCellTextColour(); +void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) +{ + m_defaultCellAttr->GetAlignment(horiz, vert); +} + +wxGridCellRenderer *wxGrid::GetDefaultRenderer() const +{ + return m_defaultCellAttr->GetRenderer(); +} - delete attr; +// ---------------------------------------------------------------------------- +// access to cell attributes +// ---------------------------------------------------------------------------- +wxColour wxGrid::GetCellBackgroundColour(int row, int col) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + wxColour colour = attr->GetBackgroundColour(); + attr->SafeDecRef(); return colour; } - -wxFont wxGrid::GetDefaultCellFont() +wxColour wxGrid::GetCellTextColour( int row, int col ) { - return m_defaultCellFont; + wxGridCellAttr *attr = GetCellAttr(row, col); + wxColour colour = attr->GetTextColour(); + attr->SafeDecRef(); + return colour; } wxFont wxGrid::GetCellFont( int row, int col ) { - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; + wxGridCellAttr *attr = GetCellAttr(row, col); + wxFont font = attr->GetFont(); + attr->SafeDecRef(); + return font; +} + +void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + attr->GetAlignment(horiz, vert); + attr->SafeDecRef(); +} + +wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellRenderer* renderer = attr->GetRenderer(); + attr->DecRef(); + return renderer; +} + +// ---------------------------------------------------------------------------- +// attribute support: cache, automatic provider creation, ... +// ---------------------------------------------------------------------------- + +bool wxGrid::CanHaveAttributes() +{ + if ( !m_table ) + { + return FALSE; + } + + // RD: Maybe m_table->CanHaveAttributes() would be better in case the + // table is providing the attributes itself??? In which case + // I don't think the grid should create a Provider object for the + // table but the table should be smart enough to do that on its own. + if ( !m_table->GetAttrProvider() ) + { + // use the default attr provider by default + // (another choice would be to just return FALSE thus forcing the user + // to it himself) + m_table->SetAttrProvider(new wxGridCellAttrProvider); + } + + return TRUE; +} + +void wxGrid::ClearAttrCache() +{ + if ( m_attrCache.row != -1 ) + { + m_attrCache.attr->SafeDecRef(); + m_attrCache.row = -1; + } +} + +void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const +{ + wxGrid *self = (wxGrid *)this; // const_cast + + self->ClearAttrCache(); + self->m_attrCache.row = row; + self->m_attrCache.col = col; + self->m_attrCache.attr = attr; + attr->SafeIncRef(); +} + +bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const +{ + if ( row == m_attrCache.row && col == m_attrCache.col ) + { + *attr = m_attrCache.attr; + (*attr)->SafeIncRef(); + +#ifdef DEBUG_ATTR_CACHE + gs_nAttrCacheHits++; +#endif - wxFont font; - if ( attr && attr->HasFont() ) - font = attr->GetFont(); + return TRUE; + } else - font = GetDefaultCellFont(); + { +#ifdef DEBUG_ATTR_CACHE + gs_nAttrCacheMisses++; +#endif + return FALSE; + } +} - delete attr; +wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const +{ + wxGridCellAttr *attr; + if ( !LookupAttr(row, col, &attr) ) + { + attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL; + CacheAttr(row, col, attr); + } + if (attr) { + attr->SetDefAttr(m_defaultCellAttr); + } else { + attr = m_defaultCellAttr; + attr->IncRef(); + } - return font; + return attr; } -void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) +wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const { - if ( horiz ) - *horiz = m_defaultCellHAlign; - if ( vert ) - *vert = m_defaultCellVAlign; + wxGridCellAttr *attr; + if ( !LookupAttr(row, col, &attr) || !attr ) + { + wxASSERT_MSG( m_table, + _T("we may only be called if CanHaveAttributes() " + "returned TRUE and then m_table should be !NULL") ); + + attr = m_table->GetAttr(row, col); + if ( !attr ) + { + attr = new wxGridCellAttr; + + // artificially inc the ref count to match DecRef() in caller + attr->IncRef(); + + m_table->SetAttr(attr, row, col); + } + + CacheAttr(row, col, attr); + } + attr->SetDefAttr(m_defaultCellAttr); + return attr; } -void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) +// ---------------------------------------------------------------------------- +// setting cell attributes: this is forwarded to the table +// ---------------------------------------------------------------------------- + +void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) { - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; + if ( CanHaveAttributes() ) + { + m_table->SetRowAttr(attr, row); + } + else + { + attr->SafeDecRef(); + } +} - if ( attr && attr->HasAlignment() ) - attr->GetAlignment(horiz, vert); +void wxGrid::SetColAttr(int col, wxGridCellAttr *attr) +{ + if ( CanHaveAttributes() ) + { + m_table->SetColAttr(attr, col); + } else - GetDefaultCellAlignment(horiz, vert); + { + attr->SafeDecRef(); + } +} + +void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour ) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetBackgroundColour(colour); + attr->DecRef(); + } +} + +void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour ) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetTextColour(colour); + attr->DecRef(); + } +} + +void wxGrid::SetCellFont( int row, int col, const wxFont& font ) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetFont(font); + attr->DecRef(); + } +} + +void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert ) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetAlignment(horiz, vert); + attr->DecRef(); + } +} - delete attr; +void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetRenderer(renderer); + attr->DecRef(); + } } +// ---------------------------------------------------------------------------- +// row/col size +// ---------------------------------------------------------------------------- + void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) { m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT ); @@ -4478,12 +5397,6 @@ void wxGrid::SetRowSize( int row, int height ) m_rowBottoms[i] += diff; } CalcDimensions(); - - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_ROW_SIZE, - row, -1 ); } void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) @@ -4519,98 +5432,8 @@ void wxGrid::SetColSize( int col, int width ) m_colRights[i] += diff; } CalcDimensions(); - - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_COL_SIZE, - -1, col ); -} - -void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col ) -{ - m_gridWin->SetBackgroundColour(col); -} - -void wxGrid::SetDefaultCellTextColour( const wxColour& col ) -{ - m_gridWin->SetForegroundColour(col); -} - -void wxGrid::SetDefaultCellAlignment( int horiz, int vert ) -{ - m_defaultCellHAlign = horiz; - m_defaultCellVAlign = vert; -} - -bool wxGrid::CanHaveAttributes() -{ - if ( !m_table ) - { - return FALSE; - } - - if ( !m_table->GetAttrProvider() ) - { - // use the default attr provider by default - // (another choice would be to just return FALSE thus forcing the user - // to it himself) - m_table->SetAttrProvider(new wxGridCellAttrProvider); - } - - return TRUE; -} - -void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = new wxGridCellAttr; - attr->SetBackgroundColour(colour); - - m_table->SetAttr(attr, row, col); - } } -void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = new wxGridCellAttr; - attr->SetTextColour(colour); - - m_table->SetAttr(attr, row, col); - } -} - -void wxGrid::SetDefaultCellFont( const wxFont& font ) -{ - m_defaultCellFont = font; -} - -void wxGrid::SetCellFont( int row, int col, const wxFont& font ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = new wxGridCellAttr; - attr->SetFont(font); - - m_table->SetAttr(attr, row, col); - } -} - -void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert ) -{ - if ( CanHaveAttributes() ) - { - wxGridCellAttr *attr = new wxGridCellAttr; - attr->SetAlignment(horiz, vert); - - m_table->SetAttr(attr, row, col); - } -} - - // // ------ cell value accessor functions