X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb309039b6918bdb29f646b1b7a7024cb92ca304..4e5b5abbfd20653c4d6f8c0751e3d045e33e234a:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 3272dfb10f..edc925b87e 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 @@ -31,29 +39,854 @@ #include "wx/dcclient.h" #include "wx/settings.h" #include "wx/log.h" - #include "wx/sizer.h" #endif -#include "wx/generic/grid.h" +// this include needs to be outside precomp for BCC +#include "wx/textfile.h" -#ifndef DRAW_LINES -#define DRAW_LINES 1 -#endif +#include "wx/grid.h" -////////////////////////////////////////////////////////////////////// -wxGridCellCoords wxGridNoCellCoords( -1, -1 ); -wxRect wxGridNoCellRect( -1, -1, -1, -1 ); +// ---------------------------------------------------------------------------- +// array classes +// ---------------------------------------------------------------------------- + +WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs); + +struct wxGridCellWithAttr +{ + wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_) + : coords(row, col), attr(attr_) + { + } + + ~wxGridCellWithAttr() + { + attr->DecRef(); + } + + wxGridCellCoords coords; + wxGridCellAttr *attr; +}; + +WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); -// this is a magic incantation which must be done! #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxGridCellCoordsArray) +WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray) + +// ---------------------------------------------------------------------------- +// private classes +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow +{ +public: + wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridRowLabelWindow( wxGrid *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size ); + +private: + wxGrid *m_owner; + + void OnPaint( wxPaintEvent& event ); + void OnMouseEvent( wxMouseEvent& event ); + void OnKeyDown( wxKeyEvent& event ); + + DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow) + DECLARE_EVENT_TABLE() +}; + + +class WXDLLEXPORT wxGridColLabelWindow : public wxWindow +{ +public: + wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridColLabelWindow( wxGrid *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size ); + +private: + wxGrid *m_owner; + + void OnPaint( wxPaintEvent &event ); + void OnMouseEvent( wxMouseEvent& event ); + void OnKeyDown( wxKeyEvent& event ); + + DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow) + DECLARE_EVENT_TABLE() +}; + + +class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow +{ +public: + wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size ); + +private: + wxGrid *m_owner; + + void OnMouseEvent( wxMouseEvent& event ); + void OnKeyDown( wxKeyEvent& event ); + void OnPaint( wxPaintEvent& event ); + + DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow) + DECLARE_EVENT_TABLE() +}; + +class WXDLLEXPORT wxGridWindow : public wxPanel +{ +public: + wxGridWindow() + { + m_owner = (wxGrid *)NULL; + m_rowLabelWin = (wxGridRowLabelWindow *)NULL; + m_colLabelWin = (wxGridColLabelWindow *)NULL; + } + + wxGridWindow( wxGrid *parent, + wxGridRowLabelWindow *rowLblWin, + wxGridColLabelWindow *colLblWin, + wxWindowID id, const wxPoint &pos, const wxSize &size ); + ~wxGridWindow(); + + void ScrollWindow( int dx, int dy, const wxRect *rect ); + +private: + wxGrid *m_owner; + wxGridRowLabelWindow *m_rowLabelWin; + wxGridColLabelWindow *m_colLabelWin; + + 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 +// ---------------------------------------------------------------------------- + +// this class stores attributes set for cells +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 + int FindIndex(int row, int col) const; + + 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; + void UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols ); + +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 +// ---------------------------------------------------------------------------- + +#ifndef WXGRID_DRAW_LINES +#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 ); // scroll line size // 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(); +} + + +void wxGridCellEditor::StartingKey(wxKeyEvent& event) +{ +} + + + +wxGridCellTextEditor::wxGridCellTextEditor() +{ +} + +void wxGridCellTextEditor::Create(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler) +{ + m_control = new wxTextCtrl(parent, -1, "", + wxDefaultPosition, wxDefaultSize +#if defined(__WXMSW__) + , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ??? +#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 = ""; + ((wxTextCtrl*)m_control)->SetValue(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::StartingKey(wxKeyEvent& event) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + int code = event.KeyCode(); + if (code >= 32 && code < 255) { + wxString st((char)code); + if (! event.ShiftDown()) + st.LowerCase(); + ((wxTextCtrl*)m_control)->AppendText(st); + } +} + + +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(); + m_grid->EnableCellEditControl(FALSE); + break; + + case WXK_TAB: + event.Skip( m_grid->ProcessEvent( event ) ); + break; + + case WXK_RETURN: + if (!m_grid->ProcessEvent(event)) + m_editor->HandleReturn(event); + break; + + + default: + event.Skip(); + } +} + +// ---------------------------------------------------------------------------- +// wxGridCellRenderer +// ---------------------------------------------------------------------------- + +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; + } +} + +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; + } +} + +// ---------------------------------------------------------------------------- +// wxGridCellAttrData +// ---------------------------------------------------------------------------- + +void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col) +{ + int n = FindIndex(row, col); + if ( n == wxNOT_FOUND ) + { + // add the attribute + m_attrs.Add(new wxGridCellWithAttr(row, col, attr)); + } + else + { + if ( attr ) + { + // change the attribute + m_attrs[(size_t)n].attr = attr; + } + else + { + // remove this attribute + m_attrs.RemoveAt((size_t)n); + } + } +} + +wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const +{ + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + + int n = FindIndex(row, col); + if ( n != wxNOT_FOUND ) + { + attr = m_attrs[(size_t)n].attr; + attr->IncRef(); + } + + 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(); + for ( size_t n = 0; n < count; n++ ) + { + const wxGridCellCoords& coords = m_attrs[n].coords; + if ( (coords.GetRow() == row) && (coords.GetCol() == col) ) + { + return n; + } + } + + 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); + } + } +} + +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 +// ---------------------------------------------------------------------------- + +wxGridCellAttrProvider::wxGridCellAttrProvider() +{ + m_data = (wxGridCellAttrProviderData *)NULL; +} + +wxGridCellAttrProvider::~wxGridCellAttrProvider() +{ + delete m_data; +} + +void wxGridCellAttrProvider::InitData() +{ + m_data = new wxGridCellAttrProviderData; +} + +wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const +{ + 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(wxGridCellAttr *attr, + int row, int col) +{ + if ( !m_data ) + InitData(); + + 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); +} + +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 +// ---------------------------------------------------------------------------- + ////////////////////////////////////////////////////////////////////// // // Abstract base class for grid data (the model) @@ -62,66 +895,132 @@ IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject ) wxGridTableBase::wxGridTableBase() - : wxObject() { m_view = (wxGrid *) NULL; + m_attrProvider = (wxGridCellAttrProvider *) NULL; } wxGridTableBase::~wxGridTableBase() { + delete m_attrProvider; +} + +void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider) +{ + delete m_attrProvider; + m_attrProvider = attrProvider; +} + +wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col) +{ + if ( m_attrProvider ) + return m_attrProvider->GetAttr(row, col); + else + return (wxGridCellAttr *)NULL; +} + +void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) +{ + if ( m_attrProvider ) + { + m_attrProvider->SetAttr(attr, row, col); + } + else + { + // as we take ownership of the pointer and don't store it, we must + // free it now + 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(); + } +} + +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 ) { - wxLogWarning( wxT("Called grid table class function InsertRows(pos=%d, N=%d)\n" - "but your derived table class does not override this function"), - pos, numRows ); + wxFAIL_MSG( wxT("Called grid table class function InsertRows\n" + "but your derived table class does not override this function") ); return FALSE; } bool wxGridTableBase::AppendRows( size_t numRows ) { - wxLogWarning( wxT("Called grid table class function AppendRows(N=%d)\n" - "but your derived table class does not override this function"), - numRows ); + wxFAIL_MSG( wxT("Called grid table class function AppendRows\n" + "but your derived table class does not override this function")); return FALSE; } bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows ) { - wxLogWarning( wxT("Called grid table class function DeleteRows(pos=%d, N=%d)\n" - "but your derived table class does not override this function"), - pos, numRows ); + wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n" + "but your derived table class does not override this function")); return FALSE; } bool wxGridTableBase::InsertCols( size_t pos, size_t numCols ) { - wxLogWarning( wxT("Called grid table class function InsertCols(pos=%d, N=%d)\n" - "but your derived table class does not override this function"), - pos, numCols ); + wxFAIL_MSG( wxT("Called grid table class function InsertCols\n" + "but your derived table class does not override this function")); return FALSE; } bool wxGridTableBase::AppendCols( size_t numCols ) { - wxLogWarning( wxT("Called grid table class function AppendCols(N=%d)\n" - "but your derived table class does not override this function"), - numCols ); + wxFAIL_MSG(wxT("Called grid table class function AppendCols\n" + "but your derived table class does not override this function")); return FALSE; } bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols ) { - wxLogWarning( wxT("Called grid table class function DeleteCols(pos=%d, N=%d)\n" - "but your derived table class does not override this function"), - pos, numCols ); + wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n" + "but your derived table class does not override this function")); return FALSE; } @@ -305,7 +1204,7 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) { m_data.Insert( sa, row ); } - + UpdateAttrRows( pos, numRows ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -361,9 +1260,11 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) if ( pos >= curNumRows ) { - wxLogError( wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)...\n" - "Pos value is invalid for present table with %d rows"), - pos, numRows, curNumRows ); + wxString errmsg; + errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n" + "Pos value is invalid for present table with %d rows", + pos, numRows, curNumRows ); + wxFAIL_MSG( wxT(errmsg) ); return FALSE; } @@ -383,7 +1284,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) m_data.Remove( pos ); } } - + UpdateAttrRows( pos, -((int)numRows) ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -416,7 +1317,7 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) m_data[row].Insert( wxEmptyString, col ); } } - + UpdateAttrCols( pos, numCols ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -439,8 +1340,8 @@ bool wxGridStringTable::AppendCols( size_t numCols ) { // TODO: something better than this ? // - wxLogError( wxT("Unable to append cols to a grid table with no rows.\n" - "Call AppendRows() first") ); + wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\n" + "Call AppendRows() first") ); return FALSE; } @@ -473,9 +1374,11 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) if ( pos >= curNumCols ) { - wxLogError( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n" - "Pos value is invalid for present table with %d cols"), - pos, numCols, curNumCols ); + wxString errmsg; + errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n" + "Pos value is invalid for present table with %d cols", + pos, numCols, curNumCols ); + wxFAIL_MSG( wxT( errmsg ) ); return FALSE; } @@ -498,7 +1401,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) } } } - + UpdateAttrCols( pos, -((int)numCols) ); if ( GetView() ) { wxGridTableMessage msg( this, @@ -520,168 +1423,59 @@ wxString wxGridStringTable::GetRowLabelValue( int row ) // return wxGridTableBase::GetRowLabelValue( row ); } - else - { - return m_rowLabels[ row ]; - } -} - -wxString wxGridStringTable::GetColLabelValue( int col ) -{ - if ( col > (int)(m_colLabels.GetCount()) - 1 ) - { - // using default label - // - return wxGridTableBase::GetColLabelValue( col ); - } - else - { - return m_colLabels[ col ]; - } -} - -void wxGridStringTable::SetRowLabelValue( int row, const wxString& value ) -{ - if ( row > (int)(m_rowLabels.GetCount()) - 1 ) - { - int n = m_rowLabels.GetCount(); - int i; - for ( i = n; i <= row; i++ ) - { - m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) ); - } - } - - m_rowLabels[row] = value; -} - -void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) -{ - if ( col > (int)(m_colLabels.GetCount()) - 1 ) - { - int n = m_colLabels.GetCount(); - int i; - for ( i = n; i <= col; i++ ) - { - m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) ); - } - } - - m_colLabels[col] = 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; + else + { + return m_rowLabels[ row ]; + } +} - default: - event.Skip(); +wxString wxGridStringTable::GetColLabelValue( int col ) +{ + if ( col > (int)(m_colLabels.GetCount()) - 1 ) + { + // using default label + // + return wxGridTableBase::GetColLabelValue( col ); + } + else + { + return m_colLabels[ col ]; + } +} + +void wxGridStringTable::SetRowLabelValue( int row, const wxString& value ) +{ + if ( row > (int)(m_rowLabels.GetCount()) - 1 ) + { + int n = m_rowLabels.GetCount(); + int i; + for ( i = n; i <= row; i++ ) + { + m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) ); + } } + + m_rowLabels[row] = value; } -void wxGridTextCtrl::SetStartValue( const wxString& s ) +void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) { - startValue = s; - wxTextCtrl::SetValue(s); + if ( col > (int)(m_colLabels.GetCount()) - 1 ) + { + int n = m_colLabels.GetCount(); + int i; + for ( i = n; i <= col; i++ ) + { + m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) ); + } + } + + m_colLabels[col] = value; } +////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow ) @@ -809,15 +1603,15 @@ wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent, void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); - + int client_height = 0; int client_width = 0; GetClientSize( &client_width, &client_height ); - + dc.SetPen( *wxBLACK_PEN ); dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 ); dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 ); - + dc.SetPen( *wxWHITE_PEN ); dc.DrawLine( 0, 0, client_width, 0 ); dc.DrawLine( 0, 0, 0, client_height ); @@ -848,18 +1642,18 @@ 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, wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxPanel( parent, id, pos, size, wxSUNKEN_BORDER, "grid window" ) + : wxPanel( parent, id, pos, size, 0, "grid window" ) { m_owner = parent; m_rowLabelWin = rowLblWin; m_colLabelWin = colLblWin; - SetBackgroundColour( "WHITE" ); } @@ -876,7 +1670,7 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxRegion reg = GetUpdateRegion(); m_owner->CalcCellsExposed( reg ); m_owner->DrawGridCellArea( dc ); -#if DRAW_LINES +#if WXGRID_DRAW_LINES m_owner->DrawAllGridLines( dc, reg ); #endif } @@ -904,16 +1698,22 @@ void wxGridWindow::OnKeyDown( wxKeyEvent& event ) if ( !m_owner->ProcessEvent( event ) ) event.Skip(); } +void wxGridWindow::OnEraseBackground(wxEraseEvent&) +{ } + + ////////////////////////////////////////////////////////////////////// + IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow ) 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, @@ -930,7 +1730,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; } @@ -940,23 +1752,40 @@ wxGrid::~wxGrid() void wxGrid::Create() { - int colLblH = WXGRID_DEFAULT_COL_LABEL_HEIGHT; - int rowLblW = WXGRID_DEFAULT_ROW_LABEL_WIDTH; + m_created = FALSE; // set to TRUE by CreateGrid + m_displayed = TRUE; // FALSE; // set to TRUE by OnPaint + + m_table = (wxGridTableBase *) NULL; + m_ownTable = FALSE; + + m_cellEditCtrlEnabled = FALSE; + + 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; + + m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH; + m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; + + m_cornerLabelWin = new wxGridCornerLabelWindow( this, + -1, + wxDefaultPosition, + wxDefaultSize ); m_rowLabelWin = new wxGridRowLabelWindow( this, -1, wxDefaultPosition, - wxSize(rowLblW,-1) ); + wxDefaultSize ); m_colLabelWin = new wxGridColLabelWindow( this, -1, wxDefaultPosition, - wxSize(-1, colLblH ) ); - - m_cornerLabelWin = new wxGridCornerLabelWindow( this, - -1, - wxDefaultPosition, - wxSize(rowLblW, colLblH ) ); + wxDefaultSize ); m_gridWin = new wxGridWindow( this, m_rowLabelWin, @@ -966,23 +1795,6 @@ void wxGrid::Create() wxDefaultSize ); SetTargetWindow( m_gridWin ); - - m_mainSizer = new wxBoxSizer( wxVERTICAL ); - - m_topSizer = new wxBoxSizer( wxHORIZONTAL ); - m_topSizer->Add( m_cornerLabelWin, 0 ); - m_topSizer->Add( m_colLabelWin, 1 ); - - m_mainSizer->Add( m_topSizer, 0, wxEXPAND ); - - m_middleSizer = new wxBoxSizer( wxHORIZONTAL ); - m_middleSizer->Add( m_rowLabelWin, 0, wxEXPAND ); - m_middleSizer->Add( m_gridWin, 1, wxEXPAND ); - - m_mainSizer->Add( m_middleSizer, 1, wxEXPAND ); - - SetAutoLayout( TRUE ); - SetSizer( m_mainSizer ); } @@ -990,7 +1802,7 @@ bool wxGrid::CreateGrid( int numRows, int numCols ) { if ( m_created ) { - wxLogError( wxT("wxGrid::CreateGrid(numRows, numCols) called more than once") ); + wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); return FALSE; } else @@ -1000,6 +1812,35 @@ 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 ) + { + // 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; + } + 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; } @@ -1032,6 +1873,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(); @@ -1072,17 +1916,28 @@ void wxGrid::Init() m_colRights.Add( colRight ); } - // TODO: improve this ? - // - m_defaultCellFont = this->GetFont(); + // 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( + wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + 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; + m_startDragPos = wxDefaultPosition; + + m_waitForSlowClick = FALSE; m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS ); m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE ); @@ -1091,29 +1946,14 @@ 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 m_inOnKeyDown = FALSE; m_batchCount = 0; - // TODO: extend this to other types of controls - // - m_cellEditCtrl = new wxGridTextCtrl( m_gridWin, - this, - TRUE, - wxGRID_CELLCTRL, - "", - wxPoint(1,1), - wxSize(1,1) -#if defined(__WXMSW__) - , wxTE_MULTILINE | wxTE_NO_VSCROLL -#endif - ); - - m_cellEditCtrl->Show( FALSE ); - m_cellEditCtrlEnabled = TRUE; - m_editCtrlType = wxGRID_TEXTCTRL; } @@ -1124,8 +1964,8 @@ void wxGrid::CalcDimensions() if ( m_numRows > 0 && m_numCols > 0 ) { - int right = m_colRights[ m_numCols-1 ] + 20; - int bottom = m_rowBottoms[ m_numRows-1 ] + 20; + int right = m_colRights[ m_numCols-1 ] + 50; + int bottom = m_rowBottoms[ m_numRows-1 ] + 50; // TODO: restore the scroll position that we had before sizing // @@ -1133,11 +1973,30 @@ void wxGrid::CalcDimensions() GetViewStart( &x, &y ); SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE, right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE, - x, y, TRUE ); + x, y ); } } +void wxGrid::CalcWindowSizes() +{ + int cw, ch; + GetClientSize( &cw, &ch ); + + if ( m_cornerLabelWin->IsShown() ) + m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight ); + + if ( m_colLabelWin->IsShown() ) + m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight); + + if ( m_rowLabelWin->IsShown() ) + m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight); + + if ( m_gridWin->IsShown() ) + m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight); +} + + // this is called when the grid table sends a message to say that it // has been redimensioned // @@ -1454,7 +2313,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; @@ -1463,7 +2322,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; @@ -1500,6 +2359,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 ) { @@ -1511,14 +2374,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; @@ -1527,9 +2392,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 @@ -1542,14 +2415,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); } } @@ -1572,47 +2445,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( TRUE, &rect ); - } + DoEndDragResizeRow(); - ShowCellEditControl(); - - // 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_dragLastPos = -1; + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); + m_dragLastPos = -1; } @@ -1649,17 +2491,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 ) { - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR ); - } + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, FALSE); } } } @@ -1687,6 +2525,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 ) { @@ -1698,14 +2540,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; @@ -1714,9 +2558,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 @@ -1729,14 +2581,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); } } @@ -1759,47 +2611,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( TRUE, &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 ); } + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); m_dragLastPos = -1; } @@ -1837,17 +2657,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 ) { - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR ); - } + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, FALSE); } } } @@ -1888,6 +2704,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 ) { @@ -1900,6 +2779,19 @@ 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 ) { @@ -1907,6 +2799,13 @@ 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() ) @@ -1917,23 +2816,86 @@ 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 ) + { + int cw, ch, left, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &left, &dummy ); + + 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 ) + { + 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 ); + x = wxMax( x, + m_colRights[m_dragRowOrCol] - + m_colWidths[m_dragRowOrCol] + WXGRID_MIN_COL_WIDTH ); + 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; } m_isDragging = FALSE; + m_startDragPos = wxDefaultPosition; + 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() ) { + EnableCellEditControl( FALSE ); 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(), @@ -1941,7 +2903,18 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) 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) { + EnableCellEditControl(TRUE); + ShowCellEditControl(); + m_waitForSlowClick = FALSE; + } + else { + SetCurrentCell( coords ); + m_waitForSlowClick = TRUE; + } } } } @@ -1951,10 +2924,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.LeftDClick() ) { - SendEvent( EVT_GRID_CELL_LEFT_DCLICK, - coords.GetRow(), - coords.GetCol(), - event ); + EnableCellEditControl( FALSE ); + if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) + { + SendEvent( EVT_GRID_CELL_LEFT_DCLICK, + coords.GetRow(), + coords.GetCol(), + event ); + } } @@ -1966,14 +2943,38 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if ( IsSelection() ) { + if (m_winCapture) { + m_winCapture->ReleaseMouse(); + m_winCapture = NULL; + } 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(); + + // 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(); - // 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_COL_SIZE, -1, m_dragRowOrCol, event ); + } m_dragLastPos = -1; } @@ -1983,6 +2984,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.RightDown() ) { + EnableCellEditControl( FALSE ); if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK, coords.GetRow(), coords.GetCol(), @@ -1997,6 +2999,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // else if ( event.RightDClick() ) { + EnableCellEditControl( FALSE ); if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK, coords.GetRow(), coords.GetCol(), @@ -2005,10 +3008,135 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // no default action at the moment } } + + // ------------ Moving and no button action + // + else if ( event.Moving() && !event.IsButton() ) + { + 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 // @@ -2059,7 +3187,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); return FALSE; } @@ -2109,7 +3237,7 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); return FALSE; } @@ -2143,7 +3271,7 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") ); return FALSE; } @@ -2174,7 +3302,7 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") ); return FALSE; } @@ -2216,7 +3344,7 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") ); return FALSE; } @@ -2250,7 +3378,7 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") ); return FALSE; } @@ -2376,6 +3504,8 @@ void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) SetEditControlValue(); ShowCellEditControl(); } + + m_displayed = TRUE; } @@ -2385,8 +3515,8 @@ void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) // void wxGrid::OnSize( wxSizeEvent& event ) { + CalcWindowSizes(); CalcDimensions(); - event.Skip(); } @@ -2396,7 +3526,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) { // shouldn't be here - we are going round in circles... // - wxLogFatalError( wxT("wxGrid::OnKeyDown called while alread active") ); + wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") ); } m_inOnKeyDown = TRUE; @@ -2409,6 +3539,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() ) @@ -2456,17 +3592,6 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) MoveCursorRight(); } break; - - case WXK_SPACE: - if ( !IsEditable() ) - { - MoveCursorRight(); - } - else - { - event.Skip(); - } - break; case WXK_RETURN: if ( event.ControlDown() ) @@ -2479,6 +3604,13 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) } break; + case WXK_TAB: + if (event.ShiftDown()) + MoveCursorLeft(); + else + MoveCursorRight(); + break; + case WXK_HOME: if ( event.ControlDown() ) { @@ -2511,13 +3643,31 @@ 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() ) - { - event.SetEventObject( m_cellEditCtrl ); - m_cellEditCtrl->GetEventHandler()->ProcessEvent( event ); + if ( !IsCellEditControlEnabled() ) + EnableCellEditControl( TRUE ); + if (IsCellEditControlEnabled()) { + wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); + attr->GetEditor()->StartingKey(event); + attr->DecRef(); } break; } @@ -2527,6 +3677,12 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) } +void wxGrid::OnEraseBackground(wxEraseEvent&) +{ } + + + + void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) { if ( SendEvent( EVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) ) @@ -2535,25 +3691,35 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) return; } - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - - if ( m_currentCellCoords != wxGridNoCellCoords ) + if ( m_displayed && + m_currentCellCoords != wxGridNoCellCoords ) { HideCellEditControl(); SaveEditControlValue(); + EnableCellEditControl(FALSE); + + // Clear the old current cell highlight + wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); + m_currentCellCoords = coords; // Otherwise refresh redraws the highlight! + m_gridWin->Refresh( FALSE, &r ); } m_currentCellCoords = coords; SetEditControlValue(); - ShowCellEditControl(); - if ( IsSelection() ) + if ( m_displayed ) { - wxRect r( SelectionToDeviceRect() ); - ClearSelection(); - if ( !GetBatchCount() ) m_gridWin->Refresh( TRUE, &r ); + wxClientDC dc(m_gridWin); + PrepareDC(dc); + DrawCellHighlight(dc); + + if ( IsSelection() ) + { + wxRect r( SelectionToDeviceRect() ); + ClearSelection(); + if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r ); + } } } @@ -2618,23 +3784,55 @@ 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 !DRAW_LINES + 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]; + rect.y = m_rowBottoms[row] - m_rowHeights[row]; + 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(); + + if (m_currentCellCoords == coords) + DrawCellHighlight(dc); } +void wxGrid::DrawCellHighlight( wxDC& dc ) +{ + 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; + + dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID)); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + dc.DrawRectangle(rect); +} + void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) { if ( m_colWidths[coords.GetCol()] <=0 || @@ -2656,74 +3854,6 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) } -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 ); - - DrawTextRectangle( dc, GetCellValue( row, col ), rect, hAlign, vAlign ); -} - - - // TODO: remove this ??? // This is used to redraw all grid lines e.g. when the grid line colour // has been changed @@ -2752,35 +3882,40 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) CalcUnscrolledPosition( x + w, y + h, &right, &bottom ); } + // avoid drawing grid lines past the last row and col + // + right = wxMin( right, m_colRights[m_numCols-1] ); + bottom = wxMin( bottom, m_rowBottoms[m_numRows-1] ); + dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); // horizontal grid lines // int i; - for ( i = 0; i <= m_numRows; i++ ) + for ( i = 0; i < m_numRows; i++ ) { - if ( m_rowBottoms[i] > bottom ) + if ( m_rowBottoms[i]-1 > bottom ) { break; } - else if ( m_rowBottoms[i] >= top ) + else if ( m_rowBottoms[i]-1 >= top ) { - dc.DrawLine( left, m_rowBottoms[i], right, m_rowBottoms[i] ); + dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 ); } } // vertical grid lines // - for ( i = 0; i <= m_numCols; i++ ) + for ( i = 0; i < m_numCols; i++ ) { - if ( m_colRights[i] > right ) + if ( m_colRights[i]-1 > right ) { break; } - else if ( m_colRights[i] >= left ) + else if ( m_colRights[i]-1 >= left ) { - dc.DrawLine( m_colRights[i], top, m_colRights[i], bottom ); + dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom ); } } } @@ -2804,18 +3939,18 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) { if ( m_rowHeights[row] <= 0 ) return; - // draw the label's horizontal border (the vertical border is - // provided by the cell area window margin) - // + int rowTop = m_rowBottoms[row] - m_rowHeights[row]; + dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( m_rowLabelWidth-1, rowTop, + m_rowLabelWidth-1, m_rowBottoms[row]-1 ); - dc.DrawLine( 0, m_rowBottoms[row]+1, - m_rowLabelWidth, m_rowBottoms[row]+1 ); + dc.DrawLine( 0, m_rowBottoms[row]-1, + m_rowLabelWidth-1, m_rowBottoms[row]-1 ); dc.SetPen( *wxWHITE_PEN ); - - dc.DrawLine( 0, m_rowBottoms[row]+2, - m_rowLabelWidth, m_rowBottoms[row]+2 ); + dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 ); + dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop ); dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); @@ -2851,18 +3986,22 @@ void wxGrid::DrawColLabel( wxDC& dc, int col ) { if ( m_colWidths[col] <= 0 ) return; - // draw the label's vertical border (the horizontal border is - // provided by the cell area window margin) - // + int colLeft = m_colRights[col] - m_colWidths[col]; + dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( m_colRights[col]-1, 0, + m_colRights[col]-1, m_colLabelHeight-1 ); - dc.DrawLine( m_colRights[col]+1, 0, - m_colRights[col]+1, m_colLabelHeight ); + dc.DrawLine( colLeft, m_colLabelHeight-1, + m_colRights[col]-1, m_colLabelHeight-1 ); dc.SetPen( *wxWHITE_PEN ); + dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 ); + dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 ); - dc.DrawLine( m_colRights[col]+2, 0, - m_colRights[col]+2, m_colLabelHeight ); + dc.SetBackgroundMode( wxTRANSPARENT ); + dc.SetTextForeground( GetLabelTextColour() ); + dc.SetFont( GetLabelFont() ); dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); @@ -2946,13 +4085,14 @@ void wxGrid::DrawTextRectangle( wxDC& dc, // void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) { - // TODO: this won't work for WXMAC ? (lines end with '\r') - // => use wxTextFile functions then (VZ) int startPos = 0; int pos; - while ( startPos < (int)value.Length() ) + wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix ); + wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix ); + + while ( startPos < (int)tVal.Length() ) { - pos = value.Mid(startPos).Find( '\n' ); + pos = tVal.Mid(startPos).Find( eol ); if ( pos < 0 ) { break; @@ -2963,14 +4103,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) } else { - if ( value[startPos+pos-1] == '\r' ) - { - lines.Add( value.Mid(startPos, pos-1) ); - } - else - { - lines.Add( value.Mid(startPos, pos) ); - } + lines.Add( value.Mid(startPos, pos) ); } startPos += pos+1; } @@ -3015,26 +4148,24 @@ 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 ); - } + EnableCellEditControl(m_editable); } } -#if 0 // disabled for the moment - the cell control is always active void wxGrid::EnableCellEditControl( bool enable ) { - if ( m_cellEditCtrl && - enable != m_cellEditCtrlEnabled ) - { - m_cellEditCtrlEnabled = enable; + if (! m_editable) + return; + + if ( m_currentCellCoords == wxGridNoCellCoords ) + SetCurrentCell( 0, 0 ); - if ( m_cellEditCtrlEnabled ) + if ( enable != m_cellEditCtrlEnabled ) + { + if ( enable ) { + m_cellEditCtrlEnabled = enable; SetEditControlValue(); ShowCellEditControl(); } @@ -3042,16 +4173,14 @@ void wxGrid::EnableCellEditControl( bool enable ) { HideCellEditControl(); SaveEditControlValue(); + m_cellEditCtrlEnabled = enable; } } } -#endif void wxGrid::ShowCellEditControl() { - wxRect rect; - if ( IsCellEditControlEnabled() ) { if ( !IsVisible( m_currentCellCoords ) ) @@ -3060,14 +4189,16 @@ 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 // int left, top, right, bottom; CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top ); CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom ); - + left--; top--; right--; bottom--; // cell is shifted by one pixel int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); @@ -3076,8 +4207,7 @@ void wxGrid::ShowCellEditControl() // int extra; #if defined(__WXMOTIF__) - if ( m_currentCellCoords.GetRow() == 0 || - m_currentCellCoords.GetCol() == 0 ) + if ( row == 0 || col == 0 ) { extra = 2; } @@ -3086,8 +4216,7 @@ void wxGrid::ShowCellEditControl() extra = 4; } #else - if ( m_currentCellCoords.GetRow() == 0 || - m_currentCellCoords.GetCol() == 0 ) + if ( row == 0 || col == 0 ) { extra = 1; } @@ -3110,131 +4239,59 @@ void wxGrid::ShowCellEditControl() rect.SetLeft( wxMax(0, left - extra) ); rect.SetTop( wxMax(0, top - extra) ); rect.SetRight( rect.GetRight() + 2*extra ); - rect.SetBottom( rect.GetBottom() + 2*extra ); -#endif - - m_cellEditCtrl->SetSize( rect ); - m_cellEditCtrl->Show( TRUE ); - - switch ( m_editCtrlType ) - { - 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; - } - - m_cellEditCtrl->SetFocus(); - } - } -} - - -void wxGrid::HideCellEditControl() -{ - if ( IsCellEditControlEnabled() ) - { - m_cellEditCtrl->Show( FALSE ); - } -} - - -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; + rect.SetBottom( rect.GetBottom() + 2*extra ); +#endif - case wxGRID_COMBOBOX: - // TODO: implement this - // - break; + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(); + if (! editor->IsCreated()) { + editor->Create(m_gridWin, -1, + new wxGridCellEditorEvtHandler(this, editor)); } - } + + editor->SetSize( rect ); + editor->Show( TRUE ); + editor->BeginEdit(row, col, this, attr); + attr->DecRef(); + } } } -void wxGrid::SaveEditControlValue() +void wxGrid::HideCellEditControl() { - if ( m_table ) + if ( IsCellEditControlEnabled() ) { - wxWindow *ctrl = (wxWindow *)NULL; + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - if ( IsCellEditControlEnabled() ) - { - ctrl = m_cellEditCtrl; - } - else - { - return; - } + wxGridCellAttr* attr = GetCellAttr(row, col); + attr->GetEditor()->Show( FALSE ); + attr->DecRef(); + m_gridWin->SetFocus(); + } +} - bool valueChanged = FALSE; - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - valueChanged = (((wxGridTextCtrl *)ctrl)->GetValue() != - ((wxGridTextCtrl *)ctrl)->GetStartValue()); - SetCellValue( m_currentCellCoords, - ((wxTextCtrl *) ctrl)->GetValue() ); - break; +void wxGrid::SetEditControlValue( const wxString& value ) +{ + // RD: The new Editors get the value from the table themselves now. This + // method can probably be removed... +} - case wxGRID_CHECKBOX: - // TODO: implement this - // - break; - case wxGRID_CHOICE: - // TODO: implement this - // - break; +void wxGrid::SaveEditControlValue() +{ + if (IsCellEditControlEnabled()) { + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - case wxGRID_COMBOBOX: - // TODO: implement this - // - break; - } + wxGridCellAttr* attr = GetCellAttr(row, col); + bool changed = attr->GetEditor()->EndEdit(row, col, TRUE, this, attr); - if ( valueChanged ) - { + attr->DecRef(); + + if (changed) { SendEvent( EVT_GRID_CELL_CHANGE, m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol() ); @@ -3275,7 +4332,7 @@ int wxGrid::YToRow( int y ) if ( y < m_rowBottoms[i] ) return i; } - return -1; + return m_numRows; //-1; } @@ -3288,7 +4345,7 @@ int wxGrid::XToCol( int x ) if ( x < m_colRights[i] ) return i; } - return -1; + return m_numCols; //-1; } @@ -3868,16 +4925,53 @@ wxString wxGrid::GetColLabelValue( int col ) } } + void wxGrid::SetRowLabelSize( int width ) { - // TODO: how to do this with the box sizers ? + width = wxMax( width, 0 ); + if ( width != m_rowLabelWidth ) + { + if ( width == 0 ) + { + m_rowLabelWin->Show( FALSE ); + m_cornerLabelWin->Show( FALSE ); + } + else if ( m_rowLabelWidth == 0 ) + { + m_rowLabelWin->Show( TRUE ); + if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( TRUE ); + } + + m_rowLabelWidth = width; + CalcWindowSizes(); + Refresh( TRUE ); + } } + void wxGrid::SetColLabelSize( int height ) { - // TODO: how to do this with the box sizers ? + height = wxMax( height, 0 ); + if ( height != m_colLabelHeight ) + { + if ( height == 0 ) + { + m_colLabelWin->Show( FALSE ); + m_cornerLabelWin->Show( FALSE ); + } + else if ( m_colLabelHeight == 0 ) + { + m_colLabelWin->Show( TRUE ); + if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( TRUE ); + } + + m_colLabelHeight = height; + CalcWindowSizes(); + Refresh( TRUE ); + } } + void wxGrid::SetLabelBackgroundColour( const wxColour& colour ) { if ( m_labelBackgroundColour != colour ) @@ -4001,7 +5095,7 @@ void wxGrid::SetGridLineColour( const wxColour& colour ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - DrawAllGridLines( dc ); + DrawAllGridLines( dc, wxRegion() ); } } @@ -4017,7 +5111,7 @@ void wxGrid::EnableGridLines( bool enable ) { wxClientDC dc( m_gridWin ); PrepareDC( dc ); - DrawAllGridLines( dc ); + DrawAllGridLines( dc, wxRegion() ); } else { @@ -4035,10 +5129,9 @@ int wxGrid::GetDefaultRowSize() int wxGrid::GetRowSize( int row ) { - if ( row >= 0 && row < m_numRows ) - return m_rowHeights[row]; - else - return 0; // TODO: log an error here + wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") ); + + return m_rowHeights[row]; } int wxGrid::GetDefaultColSize() @@ -4048,209 +5141,408 @@ int wxGrid::GetDefaultColSize() int wxGrid::GetColSize( int col ) { - if ( col >= 0 && col < m_numCols ) - return m_colWidths[col]; - else - return 0; // TODO: log an error here + wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") ); + + 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 ) { - // TODO: replace this temp test code - // - return wxColour( 255, 255, 255 ); + m_defaultCellAttr->SetBackgroundColour(col); } -wxColour wxGrid::GetCellBackgroundColour( int WXUNUSED(row), int WXUNUSED(col) ) +void wxGrid::SetDefaultCellTextColour( const wxColour& col ) { - // TODO: replace this temp test code - // - return wxColour( 255, 255, 255 ); + m_defaultCellAttr->SetTextColour(col); } -wxColour wxGrid::GetDefaultCellTextColour() +void wxGrid::SetDefaultCellAlignment( int horiz, int vert ) { - // TODO: replace this temp test code - // - return wxColour( 0, 0, 0 ); + m_defaultCellAttr->SetAlignment(horiz, vert); } -wxColour wxGrid::GetCellTextColour( int WXUNUSED(row), int WXUNUSED(col) ) +void wxGrid::SetDefaultCellFont( const wxFont& font ) { - // TODO: replace this temp test code - // - return wxColour( 0, 0, 0 ); + m_defaultCellAttr->SetFont(font); } +void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) +{ + m_defaultCellAttr->SetRenderer(renderer); +} -wxFont wxGrid::GetDefaultCellFont() +void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) +{ + m_defaultCellAttr->SetEditor(editor); +} + +// ---------------------------------------------------------------------------- +// access to the default attrbiutes +// ---------------------------------------------------------------------------- + +wxColour wxGrid::GetDefaultCellBackgroundColour() { - return m_defaultCellFont; + return m_defaultCellAttr->GetBackgroundColour(); } -wxFont wxGrid::GetCellFont( int WXUNUSED(row), int WXUNUSED(col) ) +wxColour wxGrid::GetDefaultCellTextColour() { - // TODO: replace this temp test code - // - return m_defaultCellFont; + return m_defaultCellAttr->GetTextColour(); +} + +wxFont wxGrid::GetDefaultCellFont() +{ + return m_defaultCellAttr->GetFont(); } void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) { - // TODO: replace this temp test code - // - *horiz = wxLEFT; - *vert = wxTOP; + m_defaultCellAttr->GetAlignment(horiz, vert); } -void wxGrid::GetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int *horiz, int *vert ) +wxGridCellRenderer *wxGrid::GetDefaultRenderer() const { - // TODO: replace this temp test code - // - *horiz = wxLEFT; - *vert = wxTOP; + return m_defaultCellAttr->GetRenderer(); } -void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) +wxGridCellEditor *wxGrid::GetDefaultEditor() const { - m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT ); + return m_defaultCellAttr->GetEditor(); +} - if ( resizeExistingRows ) +// ---------------------------------------------------------------------------- +// access to cell attributes +// ---------------------------------------------------------------------------- + +wxColour wxGrid::GetCellBackgroundColour(int row, int col) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + wxColour colour = attr->GetBackgroundColour(); + attr->SafeDecRef(); + return colour; +} + +wxColour wxGrid::GetCellTextColour( int row, int col ) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + wxColour colour = attr->GetTextColour(); + attr->SafeDecRef(); + return colour; +} + +wxFont wxGrid::GetCellFont( int row, int col ) +{ + 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; +} + +wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(); + attr->DecRef(); + return editor; +} + +// ---------------------------------------------------------------------------- +// attribute support: cache, automatic provider creation, ... +// ---------------------------------------------------------------------------- + +bool wxGrid::CanHaveAttributes() +{ + if ( !m_table ) { - int row; - int bottom = 0; - for ( row = 0; row < m_numRows; row++ ) - { - m_rowHeights[row] = m_defaultRowHeight; - bottom += m_defaultRowHeight; - m_rowBottoms[row] = bottom; - } - CalcDimensions(); + 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::SetRowSize( int row, int height ) +void wxGrid::ClearAttrCache() { - int i; + 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(); +} - if ( row >= 0 && row < m_numRows ) +bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const +{ + if ( row == m_attrCache.row && col == m_attrCache.col ) { - int h = wxMax( 0, height ); - int diff = h - m_rowHeights[row]; + *attr = m_attrCache.attr; + (*attr)->SafeIncRef(); - m_rowHeights[row] = h; - for ( i = row; i < m_numRows; i++ ) - { - m_rowBottoms[i] += diff; - } - CalcDimensions(); +#ifdef DEBUG_ATTR_CACHE + gs_nAttrCacheHits++; +#endif - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_ROW_SIZE, - row, -1 ); + return TRUE; } else { - // TODO: log an error here +#ifdef DEBUG_ATTR_CACHE + gs_nAttrCacheMisses++; +#endif + return FALSE; } } -void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) +wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const { - m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH ); - - if ( resizeExistingCols ) + wxGridCellAttr *attr; + if ( !LookupAttr(row, col, &attr) ) { - int col; - int right = 0; - for ( col = 0; col < m_numCols; col++ ) - { - m_colWidths[col] = m_defaultColWidth; - right += m_defaultColWidth; - m_colRights[col] = right; - } - CalcDimensions(); + 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 attr; } -void wxGrid::SetColSize( int col, int width ) +wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const { - int i; - - if ( col >= 0 && col < m_numCols ) + wxGridCellAttr *attr; + if ( !LookupAttr(row, col, &attr) || !attr ) { - int w = wxMax( 0, width ); - int diff = w - m_colWidths[col]; - m_colWidths[col] = w; + wxASSERT_MSG( m_table, + _T("we may only be called if CanHaveAttributes() " + "returned TRUE and then m_table should be !NULL") ); - for ( i = col; i < m_numCols; i++ ) + attr = m_table->GetAttr(row, col); + if ( !attr ) { - m_colRights[i] += diff; + attr = new wxGridCellAttr; + + // artificially inc the ref count to match DecRef() in caller + attr->IncRef(); + + m_table->SetAttr(attr, row, col); } - CalcDimensions(); - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_COL_SIZE, - -1, col ); + CacheAttr(row, col, attr); + } + attr->SetDefAttr(m_defaultCellAttr); + return attr; +} + +// ---------------------------------------------------------------------------- +// setting cell attributes: this is forwarded to the table +// ---------------------------------------------------------------------------- + +void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) +{ + if ( CanHaveAttributes() ) + { + m_table->SetRowAttr(attr, row); } else { - // TODO: log an error here + attr->SafeDecRef(); } } -void wxGrid::SetDefaultCellBackgroundColour( const wxColour& ) +void wxGrid::SetColAttr(int col, wxGridCellAttr *attr) { - // TODO: everything !!! - // + if ( CanHaveAttributes() ) + { + m_table->SetColAttr(attr, col); + } + else + { + attr->SafeDecRef(); + } } -void wxGrid::SetCellBackgroundColour( int WXUNUSED(row), int WXUNUSED(col), const wxColour& ) +void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour ) { - // TODO: everything !!! - // + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetBackgroundColour(colour); + attr->DecRef(); + } } -void wxGrid::SetDefaultCellTextColour( const wxColour& ) +void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour ) { - // TODO: everything !!! - // + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetTextColour(colour); + attr->DecRef(); + } } -void wxGrid::SetCellTextColour( int WXUNUSED(row), int WXUNUSED(col), const wxColour& ) +void wxGrid::SetCellFont( int row, int col, const wxFont& font ) { - // TODO: everything !!! - // + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetFont(font); + attr->DecRef(); + } } -void wxGrid::SetDefaultCellFont( const wxFont& ) +void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert ) { - // TODO: everything !!! - // + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetAlignment(horiz, vert); + attr->DecRef(); + } } -void wxGrid::SetCellFont( int WXUNUSED(row), int WXUNUSED(col), const wxFont& ) +void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) { - // TODO: everything !!! - // + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetRenderer(renderer); + attr->DecRef(); + } } -void wxGrid::SetDefaultCellAlignment( int WXUNUSED(horiz), int WXUNUSED(vert) ) +void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor) { - // TODO: everything !!! - // + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetEditor(editor); + attr->DecRef(); + } } -void wxGrid::SetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(horiz), int WXUNUSED(vert) ) +// ---------------------------------------------------------------------------- +// row/col size +// ---------------------------------------------------------------------------- + +void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) { - // TODO: everything !!! - // + m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT ); + + if ( resizeExistingRows ) + { + int row; + int bottom = 0; + for ( row = 0; row < m_numRows; row++ ) + { + m_rowHeights[row] = m_defaultRowHeight; + bottom += m_defaultRowHeight; + m_rowBottoms[row] = bottom; + } + CalcDimensions(); + } +} + +void wxGrid::SetRowSize( int row, int height ) +{ + wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") ); + + int i; + + int h = wxMax( 0, height ); + int diff = h - m_rowHeights[row]; + + m_rowHeights[row] = h; + for ( i = row; i < m_numRows; i++ ) + { + m_rowBottoms[i] += diff; + } + CalcDimensions(); +} + +void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) +{ + m_defaultColWidth = wxMax( width, WXGRID_MIN_COL_WIDTH ); + + if ( resizeExistingCols ) + { + int col; + int right = 0; + for ( col = 0; col < m_numCols; col++ ) + { + m_colWidths[col] = m_defaultColWidth; + right += m_defaultColWidth; + m_colRights[col] = right; + } + CalcDimensions(); + } } +void wxGrid::SetColSize( int col, int width ) +{ + wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") ); + + int i; + + int w = wxMax( 0, width ); + int diff = w - m_colWidths[col]; + m_colWidths[col] = w; + + for ( i = col; i < m_numCols; i++ ) + { + m_colRights[i] += diff; + } + CalcDimensions(); +} // @@ -4341,18 +5633,18 @@ void wxGrid::SelectRow( int row, bool addToSelected ) for (i = 0; i < 4; i++ ) if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( TRUE, &(rect[i]) ); + m_gridWin->Refresh( FALSE, &(rect[i]) ); } else { r = SelectionToDeviceRect(); ClearSelection(); - if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r ); + if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r ); m_selectedTopLeft.Set( row, 0 ); m_selectedBottomRight.Set( row, m_numCols-1 ); r = SelectionToDeviceRect(); - m_gridWin->Refresh( TRUE, &r ); + m_gridWin->Refresh( FALSE, &r ); } wxGridRangeSelectEvent gridEvt( GetId(), @@ -4382,7 +5674,7 @@ void wxGrid::SelectCol( int col, bool addToSelected ) { need_refresh[0] = TRUE; rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ), - wxGridCellCoords ( m_numRows - 1, + wxGridCellCoords ( m_numRows - 1, oldLeft - 1 ) ); m_selectedTopLeft.SetCol( col ); } @@ -4391,7 +5683,7 @@ void wxGrid::SelectCol( int col, bool addToSelected ) { need_refresh[1] = TRUE; rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ), - wxGridCellCoords ( oldTop - 1, + wxGridCellCoords ( oldTop - 1, oldRight ) ); m_selectedTopLeft.SetRow( 0 ); } @@ -4417,20 +5709,20 @@ void wxGrid::SelectCol( int col, bool addToSelected ) for (i = 0; i < 4; i++ ) if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( TRUE, &(rect[i]) ); + m_gridWin->Refresh( FALSE, &(rect[i]) ); } else { wxRect r; - + r = SelectionToDeviceRect(); ClearSelection(); - if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r ); + if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r ); m_selectedTopLeft.Set( 0, col ); m_selectedBottomRight.Set( m_numRows-1, col ); r = SelectionToDeviceRect(); - m_gridWin->Refresh( TRUE, &r ); + m_gridWin->Refresh( FALSE, &r ); } wxGridRangeSelectEvent gridEvt( GetId(), @@ -4510,13 +5802,13 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) // Now, either the stuff marked old is the outer // rectangle or we don't have a situation where one // is contained in the other. - + if ( oldLeft < leftCol ) { need_refresh[0] = TRUE; rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, oldLeft ), - wxGridCellCoords ( oldBottom, + wxGridCellCoords ( oldBottom, leftCol - 1 ) ); } @@ -4525,7 +5817,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) need_refresh[1] = TRUE; rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, leftCol ), - wxGridCellCoords ( topRow - 1, + wxGridCellCoords ( topRow - 1, rightCol ) ); } @@ -4551,11 +5843,11 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) // Change Selection m_selectedTopLeft = updateTopLeft; m_selectedBottomRight = updateBottomRight; - + // various Refresh() calls for (i = 0; i < 4; i++ ) if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( TRUE, &(rect[i]) ); + m_gridWin->Refresh( FALSE, &(rect[i]) ); } // only generate an event if the block is not being selected by