X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c086ef99ddc150d3df4df6b2be16cb644c6cb8..236a9de39afa090fdee3cf91cb5364ceca69e3f8:/src/generic/grid.cpp?ds=sidebyside diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 9bf212b8e0..65a3603c05 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -47,8 +47,25 @@ #include "wx/textfile.h" #include "wx/spinctrl.h" +#include "wx/tokenzr.h" #include "wx/grid.h" +#include "wx/generic/gridsel.h" + +#if defined(__WXMOTIF__) + #define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier) +#else + #define WXUNUSED_MOTIF(identifier) identifier +#endif + +#if defined(__WXGTK__) + #define WXUNUSED_GTK(identifier) WXUNUSED(identifier) +#else + #define WXUNUSED_GTK(identifier) identifier +#endif + +// Required for wxIs... functions +#include // ---------------------------------------------------------------------------- // array classes @@ -263,7 +280,11 @@ struct wxGridDataTypeInfo : m_typeName(typeName), m_renderer(renderer), m_editor(editor) { } - ~wxGridDataTypeInfo() { delete m_renderer; delete m_editor; } + ~wxGridDataTypeInfo() + { + wxSafeDecRef(m_renderer); + wxSafeDecRef(m_editor); + } wxString m_typeName; wxGridCellRenderer* m_renderer; @@ -277,12 +298,25 @@ WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray); class WXDLLEXPORT wxGridTypeRegistry { public: + wxGridTypeRegistry() {} ~wxGridTypeRegistry(); void RegisterDataType(const wxString& typeName, wxGridCellRenderer* renderer, wxGridCellEditor* editor); + + // find one of already registered data types + int FindRegisteredDataType(const wxString& typeName); + + // try to FindRegisteredDataType(), if this fails and typeName is one of + // standard typenames, register it and return its index int FindDataType(const wxString& typeName); + + // try to FindDataType(), if it fails see if it is not one of already + // registered data types with some params in which case clone the + // registered data type and set params for it + int FindOrCloneDataType(const wxString& typeName); + wxGridCellRenderer* GetRenderer(int index); wxGridCellEditor* GetEditor(int index); @@ -449,6 +483,7 @@ void wxGridCellEditor::StartingClick() wxGridCellTextEditor::wxGridCellTextEditor() { + m_maxChars = 0; } void wxGridCellTextEditor::Create(wxWindow* parent, @@ -462,6 +497,8 @@ void wxGridCellTextEditor::Create(wxWindow* parent, #endif ); + // TODO: use m_maxChars + wxGridCellEditor::Create(parent, id, evtHandler); } @@ -563,7 +600,7 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() ) { // insert the key in the control - long keycode = event.KeyCode(); + int keycode = (int)event.KeyCode(); if ( isprint(keycode) ) { // FIXME this is not going to work for non letters... @@ -582,11 +619,12 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) event.Skip(); } -void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event) +void wxGridCellTextEditor::HandleReturn( wxKeyEvent& + WXUNUSED_GTK(WXUNUSED_MOTIF(event)) ) { #if defined(__WXMOTIF__) || defined(__WXGTK__) // wxMotif needs a little extra help... - int pos = Text()->GetInsertionPoint(); + size_t pos = (size_t)( Text()->GetInsertionPoint() ); wxString s( Text()->GetValue() ); s = s.Left(pos) + "\n" + s.Mid(pos); Text()->SetValue(s); @@ -598,6 +636,28 @@ void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event) #endif } +void wxGridCellTextEditor::SetParameters(const wxString& params) +{ + if ( !params ) + { + // reset to default + m_maxChars = 0; + } + else + { + long tmp; + if ( !params.ToLong(&tmp) ) + { + wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string " + "'%s' ignored"), params.c_str()); + } + else + { + m_maxChars = (size_t)tmp; + } + } +} + // ---------------------------------------------------------------------------- // wxGridCellNumberEditor // ---------------------------------------------------------------------------- @@ -653,7 +713,7 @@ void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid) if ( HasRange() ) { - Spin()->SetValue(m_valueOld); + Spin()->SetValue((int)m_valueOld); } else { @@ -692,7 +752,7 @@ void wxGridCellNumberEditor::Reset() { if ( HasRange() ) { - Spin()->SetValue(m_valueOld); + Spin()->SetValue((int)m_valueOld); } else { @@ -704,7 +764,7 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) { if ( !HasRange() ) { - long keycode = event.KeyCode(); + int keycode = (int) event.KeyCode(); if ( isdigit(keycode) || keycode == '+' || keycode == '-' ) { wxGridCellTextEditor::StartingKey(event); @@ -717,6 +777,35 @@ void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) event.Skip(); } +void wxGridCellNumberEditor::SetParameters(const wxString& params) +{ + if ( !params ) + { + // reset to default + m_min = + m_max = -1; + } + else + { + long tmp; + if ( params.BeforeFirst(_T(',')).ToLong(&tmp) ) + { + m_min = (int)tmp; + + if ( params.AfterFirst(_T(',')).ToLong(&tmp) ) + { + m_max = (int)tmp; + + // skip the error message below + return; + } + } + + wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string " + "'%s' ignored"), params.c_str()); + } +} + // ---------------------------------------------------------------------------- // wxGridCellFloatEditor // ---------------------------------------------------------------------------- @@ -779,7 +868,7 @@ void wxGridCellFloatEditor::Reset() void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) { - long keycode = event.KeyCode(); + int keycode = (int)event.KeyCode(); if ( isdigit(keycode) || keycode == '+' || keycode == '-' || keycode == '.' ) { @@ -843,8 +932,8 @@ void wxGridCellBoolEditor::SetSize(const wxRect& r) // so shift it to the right size.x -= 8; #elif defined(__WXMSW__) - // here too... - size.x -= 6; + // here too, but in other way + size.x += 1; size.y -= 2; #endif @@ -919,13 +1008,25 @@ wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count, bool allowOthers) : m_allowOthers(allowOthers) { - m_choices.Alloc(count); - for ( size_t n = 0; n < count; n++ ) + if ( count ) { - m_choices.Add(choices[n]); + m_choices.Alloc(count); + for ( size_t n = 0; n < count; n++ ) + { + m_choices.Add(choices[n]); + } } } +wxGridCellEditor *wxGridCellChoiceEditor::Clone() const +{ + wxGridCellChoiceEditor *editor = new wxGridCellChoiceEditor; + editor->m_allowOthers = m_allowOthers; + editor->m_choices = m_choices; + + return editor; +} + void wxGridCellChoiceEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) @@ -1001,6 +1102,23 @@ void wxGridCellChoiceEditor::Reset() Combo()->SetInsertionPointEnd(); } +void wxGridCellChoiceEditor::SetParameters(const wxString& params) +{ + if ( !params ) + { + // what can we do? + return; + } + + m_choices.Empty(); + + wxStringTokenizer tk(params, _T(',')); + while ( tk.HasMoreTokens() ) + { + m_choices.Add(tk.GetNextToken()); + } +} + // ---------------------------------------------------------------------------- // wxGridCellEditorEvtHandler // ---------------------------------------------------------------------------- @@ -1043,6 +1161,20 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) } } +// ---------------------------------------------------------------------------- +// wxGridCellWorker is an (almost) empty common base class for +// wxGridCellRenderer and wxGridCellEditor managing ref counting +// ---------------------------------------------------------------------------- + +void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params)) +{ + // nothing to do +} + +wxGridCellWorker::~wxGridCellWorker() +{ +} + // ============================================================================ // renderer classes // ============================================================================ @@ -1055,7 +1187,7 @@ void wxGridCellRenderer::Draw(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, const wxRect& rect, - int row, int col, + int WXUNUSED(row), int WXUNUSED(col), bool isSelected) { dc.SetBackgroundMode( wxSOLID ); @@ -1073,10 +1205,6 @@ void wxGridCellRenderer::Draw(wxGrid& grid, dc.DrawRectangle(rect); } -wxGridCellRenderer::~wxGridCellRenderer() -{ -} - // ---------------------------------------------------------------------------- // wxGridCellStringRenderer // ---------------------------------------------------------------------------- @@ -1205,24 +1333,58 @@ wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision) SetPrecision(precision); } +wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const +{ + wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer; + renderer->m_width = m_width; + renderer->m_precision = m_precision; + renderer->m_format = m_format; + + return renderer; +} + wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col) { wxGridTableBase *table = grid.GetTable(); + + bool hasDouble; + double val; wxString text; if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) ) { - if ( !m_format ) - { - m_format.Printf(_T("%%%d.%d%%f"), m_width, m_precision); - } - - text.Printf(m_format, table->GetValueAsDouble(row, col)); + val = table->GetValueAsDouble(row, col); + hasDouble = TRUE; } else { text = table->GetValue(row, col); + hasDouble = text.ToDouble(&val); } + if ( hasDouble ) + { + if ( !m_format ) + { + if ( m_width == -1 ) + { + // default width/precision + m_format = _T("%f"); + } + else if ( m_precision == -1 ) + { + // default precision + m_format.Printf(_T("%%%d.f"), m_width); + } + else + { + m_format.Printf(_T("%%%d.%df"), m_width, m_precision); + } + } + + text.Printf(m_format, val); + } + //else: text already contains the string + return text; } @@ -1256,6 +1418,54 @@ wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid, return DoGetBestSize(attr, dc, GetString(grid, row, col)); } +void wxGridCellFloatRenderer::SetParameters(const wxString& params) +{ + bool ok = TRUE; + + if ( !params ) + { + // reset to defaults + SetWidth(-1); + SetPrecision(-1); + } + else + { + wxString tmp = params.BeforeFirst(_T(',')); + if ( !!tmp ) + { + long width; + if ( !tmp.ToLong(&width) ) + { + ok = FALSE; + } + else + { + SetWidth((int)width); + + tmp = params.AfterFirst(_T(',')); + if ( !!tmp ) + { + long precision; + if ( !tmp.ToLong(&precision) ) + { + ok = FALSE; + } + else + { + SetPrecision((int)precision); + } + } + } + } + + if ( !ok ) + { + wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string " + "'%s ignored"), params.c_str()); + } + } +} + // ---------------------------------------------------------------------------- // wxGridCellBoolRenderer // ---------------------------------------------------------------------------- @@ -1265,11 +1475,7 @@ wxSize wxGridCellBoolRenderer::ms_sizeCheckMark; // FIXME these checkbox size calculations are really ugly... // between checkmark and box -#ifdef __WXGTK__ - static const wxCoord wxGRID_CHECKMARK_MARGIN = 4; -#else - static const wxCoord wxGRID_CHECKMARK_MARGIN = 2; -#endif +static const wxCoord wxGRID_CHECKMARK_MARGIN = 2; wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, wxGridCellAttr& WXUNUSED(attr), @@ -1284,7 +1490,7 @@ wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, wxCoord checkSize = 0; wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString); wxSize size = checkbox->GetBestSize(); - checkSize = size.y + wxGRID_CHECKMARK_MARGIN; + checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN; // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result #if defined(__WXGTK__) || defined(__WXMOTIF__) @@ -1320,22 +1526,11 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, } // draw a border around checkmark - wxRect rectMark; - rectMark.x = rect.x + rect.width/2 - size.x/2; - rectMark.y = rect.y + rect.height/2 - size.y/2; - rectMark.width = size.x; - rectMark.height = size.y; - - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID)); - dc.DrawRectangle(rectMark); - - rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN); - -#ifdef __WXMSW__ - // looks nicer under MSW - rectMark.x++; -#endif // MSW + wxRect rectBorder; + rectBorder.x = rect.x + rect.width/2 - size.x/2; + rectBorder.y = rect.y + rect.height/2 - size.y/2; + rectBorder.width = size.x; + rectBorder.height = size.y; bool value; if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) ) @@ -1345,15 +1540,60 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, if ( value ) { + wxRect rectMark = rectBorder; +#ifdef __WXMSW__ + // MSW DrawCheckMark() is weird (and should probably be changed...) + rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2); + rectMark.x++; + rectMark.y++; +#else // !MSW + rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN); +#endif // MSW/!MSW + dc.SetTextForeground(attr.GetTextColour()); dc.DrawCheckMark(rectMark); } + + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID)); + dc.DrawRectangle(rectBorder); } // ---------------------------------------------------------------------------- // wxGridCellAttr // ---------------------------------------------------------------------------- +wxGridCellAttr *wxGridCellAttr::Clone() const +{ + wxGridCellAttr *attr = new wxGridCellAttr; + if ( HasTextColour() ) + attr->SetTextColour(GetTextColour()); + if ( HasBackgroundColour() ) + attr->SetBackgroundColour(GetBackgroundColour()); + if ( HasFont() ) + attr->SetFont(GetFont()); + if ( HasAlignment() ) + attr->SetAlignment(m_hAlign, m_vAlign); + + if ( m_renderer ) + { + attr->SetRenderer(m_renderer); + m_renderer->IncRef(); + } + if ( m_editor ) + { + attr->SetEditor(m_editor); + m_editor->IncRef(); + } + + if ( IsReadOnly() ) + attr->SetReadOnly(); + + attr->SetDefAttr(m_defGridAttr); + + return attr; +} + const wxColour& wxGridCellAttr::GetTextColour() const { if (HasTextColour()) @@ -1425,38 +1665,58 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const { - if ((m_defGridAttr != this || grid == NULL) && HasRenderer()) - return m_renderer; // use local attribute - wxGridCellRenderer* renderer = NULL; - if (grid) // get renderer for the data type - renderer = grid->GetDefaultRendererForCell(row, col); - if (! renderer) + if ( m_defGridAttr != this || grid == NULL ) + { + renderer = m_renderer; // use local attribute + if ( renderer ) + renderer->IncRef(); + } + + if ( !renderer && grid ) // get renderer for the data type + { + // GetDefaultRendererForCell() will do IncRef() for us + renderer = grid->GetDefaultRendererForCell(row, col); + } + + if ( !renderer ) + { // if we still don't have one then use the grid default + // (no need for IncRef() here neither) renderer = m_defGridAttr->GetRenderer(NULL,0,0); + } - if (! renderer) + if ( !renderer) + { wxFAIL_MSG(wxT("Missing default cell attribute")); + } return renderer; } wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const { - if ((m_defGridAttr != this || grid == NULL) && HasEditor()) - return m_editor; // use local attribute - wxGridCellEditor* editor = NULL; - if (grid) // get renderer for the data type - editor = grid->GetDefaultEditorForCell(row, col); - if (! editor) + if ( m_defGridAttr != this || grid == NULL ) + { + editor = m_editor; // use local attribute + if ( editor ) + editor->IncRef(); + } + + if ( !editor && grid ) // get renderer for the data type + editor = grid->GetDefaultEditorForCell(row, col); + + if ( !editor ) // if we still don't have one then use the grid default editor = m_defGridAttr->GetEditor(NULL,0,0); - if (! editor) + if ( !editor ) + { wxFAIL_MSG(wxT("Missing default cell attribute")); + } return editor; } @@ -1612,8 +1872,8 @@ wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol) { - int n = m_rowsOrCols.Index(rowOrCol); - if ( n == wxNOT_FOUND ) + int i = m_rowsOrCols.Index(rowOrCol); + if ( i == wxNOT_FOUND ) { // add the attribute m_rowsOrCols.Add(rowOrCol); @@ -1621,17 +1881,19 @@ void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol) } else { + size_t n = (size_t)i; if ( attr ) { // change the attribute - m_attrs[(size_t)n] = attr; + m_attrs[n]->DecRef(); + m_attrs[n] = attr; } else { // remove this attribute - m_attrs[(size_t)n]->DecRef(); - m_rowsOrCols.RemoveAt((size_t)n); - m_attrs.RemoveAt((size_t)n); + m_attrs[n]->DecRef(); + m_rowsOrCols.RemoveAt(n); + m_attrs.RemoveAt(n); } } } @@ -1770,42 +2032,134 @@ void wxGridTypeRegistry::RegisterDataType(const wxString& typeName, wxGridCellRenderer* renderer, wxGridCellEditor* editor) { - int loc; wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor); // is it already registered? - if ((loc = FindDataType(typeName)) != -1) { + int loc = FindRegisteredDataType(typeName); + if ( loc != wxNOT_FOUND ) + { delete m_typeinfo[loc]; m_typeinfo[loc] = info; } - else { + else + { m_typeinfo.Add(info); } } +int wxGridTypeRegistry::FindRegisteredDataType(const wxString& typeName) +{ + size_t count = m_typeinfo.GetCount(); + for ( size_t i = 0; i < count; i++ ) + { + if ( typeName == m_typeinfo[i]->m_typeName ) + { + return i; + } + } + + return wxNOT_FOUND; +} + int wxGridTypeRegistry::FindDataType(const wxString& typeName) { - int found = -1; + int index = FindRegisteredDataType(typeName); + if ( index == wxNOT_FOUND ) + { + // check whether this is one of the standard ones, in which case + // register it "on the fly" + if ( typeName == wxGRID_VALUE_STRING ) + { + RegisterDataType(wxGRID_VALUE_STRING, + new wxGridCellStringRenderer, + new wxGridCellTextEditor); + } + else if ( typeName == wxGRID_VALUE_BOOL ) + { + RegisterDataType(wxGRID_VALUE_BOOL, + new wxGridCellBoolRenderer, + new wxGridCellBoolEditor); + } + else if ( typeName == wxGRID_VALUE_NUMBER ) + { + RegisterDataType(wxGRID_VALUE_NUMBER, + new wxGridCellNumberRenderer, + new wxGridCellNumberEditor); + } + else if ( typeName == wxGRID_VALUE_FLOAT ) + { + RegisterDataType(wxGRID_VALUE_FLOAT, + new wxGridCellFloatRenderer, + new wxGridCellFloatEditor); + } + else if ( typeName == wxGRID_VALUE_CHOICE ) + { + RegisterDataType(wxGRID_VALUE_CHOICE, + new wxGridCellStringRenderer, + new wxGridCellChoiceEditor); + } + else + { + return wxNOT_FOUND; + } - for (size_t i=0; im_typeName) { - found = i; - break; + // we get here only if just added the entry for this type, so return + // the last index + index = m_typeinfo.GetCount() - 1; + } + + return index; +} + +int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName) +{ + int index = FindDataType(typeName); + if ( index == wxNOT_FOUND ) + { + // the first part of the typename is the "real" type, anything after ':' + // are the parameters for the renderer + index = FindDataType(typeName.BeforeFirst(_T(':'))); + if ( index == wxNOT_FOUND ) + { + return wxNOT_FOUND; } + + wxGridCellRenderer *renderer = GetRenderer(index); + wxGridCellRenderer *rendererOld = renderer; + renderer = renderer->Clone(); + rendererOld->DecRef(); + + wxGridCellEditor *editor = GetEditor(index); + wxGridCellEditor *editorOld = editor; + editor = editor->Clone(); + editorOld->DecRef(); + + // do it even if there are no parameters to reset them to defaults + wxString params = typeName.AfterFirst(_T(':')); + renderer->SetParameters(params); + editor->SetParameters(params); + + // register the new typename + RegisterDataType(typeName, renderer, editor); + + // we just registered it, it's the last one + index = m_typeinfo.GetCount() - 1; } - return found; + return index; } wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index) { wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer; + renderer->IncRef(); return renderer; } -wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) +wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) { wxGridCellEditor* editor = m_typeinfo[index]->m_editor; + editor->IncRef(); return editor; } @@ -1861,7 +2215,7 @@ void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) { // as we take ownership of the pointer and don't store it, we must // free it now - attr->SafeDecRef(); + wxSafeDecRef(attr); } } @@ -1875,7 +2229,7 @@ void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row) { // as we take ownership of the pointer and don't store it, we must // free it now - attr->SafeDecRef(); + wxSafeDecRef(attr); } } @@ -1889,7 +2243,7 @@ void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col) { // as we take ownership of the pointer and don't store it, we must // free it now - attr->SafeDecRef(); + wxSafeDecRef(attr); } } @@ -1909,7 +2263,8 @@ void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols ) } } -bool wxGridTableBase::InsertRows( size_t pos, size_t numRows ) +bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos), + size_t WXUNUSED(numRows) ) { wxFAIL_MSG( wxT("Called grid table class function InsertRows\n" "but your derived table class does not override this function") ); @@ -1917,7 +2272,7 @@ bool wxGridTableBase::InsertRows( size_t pos, size_t numRows ) return FALSE; } -bool wxGridTableBase::AppendRows( size_t numRows ) +bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) ) { wxFAIL_MSG( wxT("Called grid table class function AppendRows\n" "but your derived table class does not override this function")); @@ -1925,7 +2280,8 @@ bool wxGridTableBase::AppendRows( size_t numRows ) return FALSE; } -bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows ) +bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos), + size_t WXUNUSED(numRows) ) { wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n" "but your derived table class does not override this function")); @@ -1933,7 +2289,8 @@ bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows ) return FALSE; } -bool wxGridTableBase::InsertCols( size_t pos, size_t numCols ) +bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos), + size_t WXUNUSED(numCols) ) { wxFAIL_MSG( wxT("Called grid table class function InsertCols\n" "but your derived table class does not override this function")); @@ -1941,7 +2298,7 @@ bool wxGridTableBase::InsertCols( size_t pos, size_t numCols ) return FALSE; } -bool wxGridTableBase::AppendCols( size_t numCols ) +bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) ) { wxFAIL_MSG(wxT("Called grid table class function AppendCols\n" "but your derived table class does not override this function")); @@ -1949,7 +2306,8 @@ bool wxGridTableBase::AppendCols( size_t numCols ) return FALSE; } -bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols ) +bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos), + size_t WXUNUSED(numCols) ) { wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n" "but your derived table class does not override this function")); @@ -2052,7 +2410,6 @@ void wxGridTableBase::SetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col), { } - ////////////////////////////////////////////////////////////////////// // // Message class for the grid table to send requests and notifications @@ -2117,12 +2474,12 @@ wxGridStringTable::~wxGridStringTable() { } -long wxGridStringTable::GetNumberRows() +int wxGridStringTable::GetNumberRows() { return m_data.GetCount(); } -long wxGridStringTable::GetNumberCols() +int wxGridStringTable::GetNumberCols() { if ( m_data.GetCount() > 0 ) return m_data[0].GetCount(); @@ -2132,26 +2489,28 @@ long wxGridStringTable::GetNumberCols() wxString wxGridStringTable::GetValue( int row, int col ) { - // TODO: bounds checking - // + wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()), + _T("invalid row or column index in wxGridStringTable") ); + return m_data[row][col]; } void wxGridStringTable::SetValue( int row, int col, const wxString& value ) { - // TODO: bounds checking - // + wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()), + _T("invalid row or column index in wxGridStringTable") ); + m_data[row][col] = value; } bool wxGridStringTable::IsEmptyCell( int row, int col ) { - // TODO: bounds checking - // + wxASSERT_MSG( (row < GetNumberRows()) && (col < GetNumberCols()), + _T("invalid row or column index in wxGridStringTable") ); + return (m_data[row][col] == wxEmptyString); } - void wxGridStringTable::Clear() { int row, col; @@ -2481,12 +2840,12 @@ END_EVENT_TABLE() wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS ) { m_owner = parent; } -void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event ) +void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); @@ -2534,12 +2893,12 @@ END_EVENT_TABLE() wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS ) { m_owner = parent; } -void wxGridColLabelWindow::OnPaint( wxPaintEvent &event ) +void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); @@ -2587,7 +2946,7 @@ END_EVENT_TABLE() wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxWindow( parent, id, pos, size ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS ) { m_owner = parent; } @@ -2641,7 +3000,7 @@ wxGridWindow::wxGridWindow( wxGrid *parent, wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxPanel( parent, id, pos, size, 0, "grid window" ) + : wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" ) { m_owner = parent; m_rowLabelWin = rowLblWin; @@ -2693,7 +3052,7 @@ void wxGridWindow::OnKeyDown( wxKeyEvent& event ) } -void wxGridWindow::OnEraseBackground(wxEraseEvent& event) +void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) { } @@ -2716,8 +3075,9 @@ wxGrid::wxGrid( wxWindow *parent, const wxSize& size, long style, const wxString& name ) - : wxScrolledWindow( parent, id, pos, size, style, name ), - m_colMinWidths(wxKEY_INTEGER, GRID_HASH_SIZE) + : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ), + m_colMinWidths(GRID_HASH_SIZE), + m_rowMinHeights(GRID_HASH_SIZE) { Create(); } @@ -2726,7 +3086,7 @@ wxGrid::wxGrid( wxWindow *parent, wxGrid::~wxGrid() { ClearAttrCache(); - m_defaultCellAttr->SafeDecRef(); + wxSafeDecRef(m_defaultCellAttr); #ifdef DEBUG_ATTR_CACHE size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses; @@ -2740,6 +3100,7 @@ wxGrid::~wxGrid() delete m_table; delete m_typeRegistry; + delete m_selection; } @@ -2750,7 +3111,6 @@ wxGrid::~wxGrid() void wxGrid::Create() { m_created = FALSE; // set to TRUE by CreateGrid - m_displayed = TRUE; // FALSE; // set to TRUE by OnPaint m_table = (wxGridTableBase *) NULL; m_ownTable = FALSE; @@ -2778,19 +3138,9 @@ void wxGrid::Create() m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH; m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; - // data type registration: register all standard data types - // TODO: may be allow the app to selectively disable some of them? + // create the type registry m_typeRegistry = new wxGridTypeRegistry; - RegisterDataType(wxGRID_VALUE_STRING, - new wxGridCellStringRenderer, - new wxGridCellTextEditor); - RegisterDataType(wxGRID_VALUE_BOOL, - new wxGridCellBoolRenderer, - new wxGridCellBoolEditor); - RegisterDataType(wxGRID_VALUE_NUMBER, - new wxGridCellNumberRenderer, - new wxGridCellNumberEditor); - + m_selection = 0; // subwindow components that make up the wxGrid m_cornerLabelWin = new wxGridCornerLabelWindow( this, -1, @@ -2818,7 +3168,8 @@ void wxGrid::Create() } -bool wxGrid::CreateGrid( int numRows, int numCols ) +bool wxGrid::CreateGrid( int numRows, int numCols, + wxGrid::wxGridSelectionModes selmode ) { if ( m_created ) { @@ -2834,13 +3185,24 @@ bool wxGrid::CreateGrid( int numRows, int numCols ) m_table->SetView( this ); m_ownTable = TRUE; Init(); + m_selection = new wxGridSelection( this, selmode ); m_created = TRUE; } - return m_created; } -bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership ) +void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode) +{ + if ( !m_created ) + { + wxFAIL_MSG( wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") ); + } + else + m_selection->SetSelectionMode( selmode ); +} + +bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, + wxGrid::wxGridSelectionModes selmode ) { if ( m_created ) { @@ -2849,6 +3211,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership ) // View at runtime. Is there anything in the implmentation that would // prevent this? + // At least, you now have to cope with m_selection wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); return FALSE; } @@ -2862,6 +3225,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership ) if (takeOwnership) m_ownTable = TRUE; Init(); + m_selection = new wxGridSelection( this, selmode ); m_created = TRUE; } @@ -2934,8 +3298,8 @@ void wxGrid::Init() m_currentCellCoords = wxGridNoCellCoords; - m_selectedTopLeft = wxGridNoCellCoords; - m_selectedBottomRight = wxGridNoCellCoords; + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT); @@ -2944,6 +3308,9 @@ void wxGrid::Init() m_inOnKeyDown = FALSE; m_batchCount = 0; + m_extraWidth = + m_extraHeight = 50; + CalcDimensions(); } @@ -3031,8 +3398,8 @@ void wxGrid::CalcDimensions() if ( m_numRows > 0 && m_numCols > 0 ) { - int right = GetColRight( m_numCols-1 ) + 50; - int bottom = GetRowBottom( m_numRows-1 ) + 50; + int right = GetColRight( m_numCols-1 ) + m_extraWidth; + int bottom = GetRowBottom( m_numRows-1 ) + m_extraHeight; // TODO: restore the scroll position that we had before sizing // @@ -3440,7 +3807,9 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - y = wxMax( y, GetRowTop(m_dragRowOrCol) + WXGRID_MIN_ROW_HEIGHT ); + y = wxMax( y, + GetRowTop(m_dragRowOrCol) + + GetRowMinimalHeight(m_dragRowOrCol) ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -3452,10 +3821,13 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_ROW: - if ( (row = YToRow( y )) >= 0 && - !IsInSelection( row, 0 ) ) + if ( (row = YToRow( y )) >= 0 ) { - SelectRow( row, TRUE ); + m_selection->SelectRow( row, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); } // default label to suppress warnings about "enumeration value @@ -3492,7 +3864,23 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if ( row >= 0 && !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) { - SelectRow( row, event.ShiftDown() ); + if ( !event.ShiftDown() && !event.ControlDown() ) + ClearSelection(); + if ( event.ShiftDown() ) + m_selection->SelectBlock( m_currentCellCoords.GetRow(), + 0, + row, + GetNumberCols() - 1, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + else + m_selection->SelectRow( row, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin); } } @@ -3619,10 +4007,13 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) break; case WXGRID_CURSOR_SELECT_COL: - if ( (col = XToCol( x )) >= 0 && - !IsInSelection( 0, col ) ) + if ( (col = XToCol( x )) >= 0 ) { - SelectCol( col, TRUE ); + m_selection->SelectCol( col, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); } // default label to suppress warnings about "enumeration value @@ -3659,7 +4050,22 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if ( col >= 0 && !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) { - SelectCol( col, event.ShiftDown() ); + if ( !event.ShiftDown() && !event.ControlDown() ) + ClearSelection(); + if ( event.ShiftDown() ) + m_selection->SelectBlock( 0, + m_currentCellCoords.GetCol(), + GetNumberRows() - 1, col, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + else + m_selection->SelectCol( col, + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin); } } @@ -3895,20 +4301,29 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( coords != wxGridNoCellCoords ) { - if ( !IsSelection() ) + if ( event.ControlDown() ) { - SelectBlock( coords, coords ); + if ( m_selectingKeyboard == wxGridNoCellCoords) + m_selectingKeyboard = coords; + SelectBlock ( m_selectingKeyboard, coords ); } else { - SelectBlock( m_currentCellCoords, coords ); + if ( !IsSelection() ) + { + SelectBlock( coords, coords ); + } + else + { + 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. + // scrolling is way to fast, at least on MSW - also on GTK. } } } @@ -3920,7 +4335,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - y = wxMax( y, GetRowTop(m_dragRowOrCol) + WXGRID_MIN_ROW_HEIGHT ); + y = wxMax( y, GetRowTop(m_dragRowOrCol) + + GetRowMinimalHeight(m_dragRowOrCol) ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -3970,9 +4386,18 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // if ( event.LeftDown() && coords != wxGridNoCellCoords ) { + if ( !event.ShiftDown() && !event.ControlDown() ) + ClearSelection(); if ( event.ShiftDown() ) { - SelectBlock( m_currentCellCoords, coords ); + m_selection->SelectBlock( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol(), + coords.GetRow(), + coords.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); } else if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) @@ -3994,14 +4419,31 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) EnableCellEditControl(); wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); - attr->GetEditor(this, coords.GetRow(), coords.GetCol())->StartingClick(); + wxGridCellEditor *editor = attr->GetEditor(this, + coords.GetRow(), + coords.GetCol()); + editor->StartingClick(); + editor->DecRef(); attr->DecRef(); m_waitForSlowClick = FALSE; } else { - SetCurrentCell( coords ); + if ( event.ControlDown() ) + { + m_selection->ToggleCellSelection( coords.GetRow(), + coords.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; + m_selectingKeyboard = coords; + } + else + SetCurrentCell( coords ); m_waitForSlowClick = TRUE; } } @@ -4031,14 +4473,24 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - if ( IsSelection() ) + if ( m_selectingTopLeft != wxGridNoCellCoords && + m_selectingBottomRight != wxGridNoCellCoords ) { if (m_winCapture) { m_winCapture->ReleaseMouse(); m_winCapture = NULL; } - SendEvent( wxEVT_GRID_RANGE_SELECT, -1, -1, event ); + m_selection->SelectBlock( m_selectingTopLeft.GetRow(), + m_selectingTopLeft.GetCol(), + m_selectingBottomRight.GetRow(), + m_selectingBottomRight.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; } // Show the edit control, if it has been hidden for @@ -4321,7 +4773,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) SetCurrentCell( 0, 0 ); } - ClearSelection(); + m_selection->UpdateRows( pos, numRows ); if ( !GetBatchCount() ) Refresh(); } @@ -4357,7 +4809,6 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the append row // operation to this view object as a grid table message // - ClearSelection(); if ( !GetBatchCount() ) Refresh(); return TRUE; } @@ -4389,7 +4840,7 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the delete row // operation to this view object as a grid table message // - ClearSelection(); + m_selection->UpdateRows( pos, -((int)numRows) ); if ( !GetBatchCount() ) Refresh(); return TRUE; } @@ -4428,7 +4879,7 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) SetCurrentCell( 0, 0 ); } - ClearSelection(); + m_selection->UpdateCols( pos, numCols ); if ( !GetBatchCount() ) Refresh(); } @@ -4464,7 +4915,6 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) SetCurrentCell( 0, 0 ); } - ClearSelection(); if ( !GetBatchCount() ) Refresh(); return TRUE; } @@ -4495,7 +4945,7 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) // the table will have sent the results of the delete col // operation to this view object as a grid table message // - ClearSelection(); + m_selection->UpdateCols( pos, -((int)numCols) ); if ( !GetBatchCount() ) Refresh(); return TRUE; } @@ -4534,11 +4984,13 @@ bool wxGrid::SendEvent( const wxEventType type, } else if ( type == wxEVT_GRID_RANGE_SELECT ) { + // Right now, it should _never_ end up here! wxGridRangeSelectEvent gridEvt( GetId(), type, this, - m_selectedTopLeft, - m_selectedBottomRight, + m_selectingTopLeft, + m_selectingBottomRight, + TRUE, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -4553,6 +5005,7 @@ bool wxGrid::SendEvent( const wxEventType type, this, row, col, mouseEv.GetX(), mouseEv.GetY(), + FALSE, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -4595,15 +5048,6 @@ bool wxGrid::SendEvent( const wxEventType type, void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc( this ); - - if ( m_currentCellCoords == wxGridNoCellCoords && - m_numRows && m_numCols ) - { - m_currentCellCoords.Set(0, 0); - ShowCellEditControl(); - } - - m_displayed = TRUE; } @@ -4611,7 +5055,7 @@ void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) // the grid view is resized... then the size event is skipped to allow // the box sizers to handle everything // -void wxGrid::OnSize( wxSizeEvent& event ) +void wxGrid::OnSize( wxSizeEvent& WXUNUSED(event) ) { CalcWindowSizes(); CalcDimensions(); @@ -4638,56 +5082,69 @@ 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 // + if ( !event.ShiftDown() && + m_selectingKeyboard != wxGridNoCellCoords ) + { + if ( m_selectingTopLeft != wxGridNoCellCoords && + m_selectingBottomRight != wxGridNoCellCoords ) + m_selection->SelectBlock( m_selectingTopLeft.GetRow(), + m_selectingTopLeft.GetCol(), + m_selectingBottomRight.GetRow(), + m_selectingBottomRight.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; + m_selectingKeyboard = wxGridNoCellCoords; + } + switch ( event.KeyCode() ) { case WXK_UP: if ( event.ControlDown() ) { - MoveCursorUpBlock(); + MoveCursorUpBlock( event.ShiftDown() ); } else { - MoveCursorUp(); + MoveCursorUp( event.ShiftDown() ); } break; case WXK_DOWN: if ( event.ControlDown() ) { - MoveCursorDownBlock(); + MoveCursorDownBlock( event.ShiftDown() ); } else { - MoveCursorDown(); + MoveCursorDown( event.ShiftDown() ); } break; case WXK_LEFT: if ( event.ControlDown() ) { - MoveCursorLeftBlock(); + MoveCursorLeftBlock( event.ShiftDown() ); } else { - MoveCursorLeft(); + MoveCursorLeft( event.ShiftDown() ); } break; case WXK_RIGHT: if ( event.ControlDown() ) { - MoveCursorRightBlock(); + MoveCursorRightBlock( event.ShiftDown() ); } else { - MoveCursorRight(); + MoveCursorRight( event.ShiftDown() ); } break; @@ -4698,15 +5155,19 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) } else { - MoveCursorDown(); + MoveCursorDown( event.ShiftDown() ); } break; + case WXK_ESCAPE: + ClearSelection(); + break; + case WXK_TAB: if (event.ShiftDown()) - MoveCursorLeft(); + MoveCursorLeft( FALSE ); else - MoveCursorRight(); + MoveCursorRight( FALSE ); break; case WXK_HOME: @@ -4742,9 +5203,19 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) break; case WXK_SPACE: + if ( event.ControlDown() ) + { + m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + break; + } if ( !IsEditable() ) { - MoveCursorRight(); + MoveCursorRight( FALSE ); break; } // Otherwise fall through to default @@ -4752,10 +5223,15 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) default: // alphanumeric keys or F2 (special key just for this) enable // the cell edit control + // On just Shift/Control I get values for event.KeyCode() + // that are outside the range where isalnum's behaviour is + // well defined, so do an additional sanity check. if ( !(event.AltDown() || event.MetaDown() || event.ControlDown()) && - (isalnum(event.KeyCode()) || event.KeyCode() == WXK_F2) && + ((isalnum((int)event.KeyCode()) && + (event.KeyCode() < 256 && event.KeyCode() >= 0)) || + event.KeyCode() == WXK_F2) && !IsCellEditControlEnabled() && CanEnableCellControl() ) { @@ -4763,7 +5239,9 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); wxGridCellAttr* attr = GetCellAttr(row, col); - attr->GetEditor(this, row, col)->StartingKey(event); + wxGridCellEditor *editor = attr->GetEditor(this, row, col); + editor->StartingKey(event); + editor->DecRef(); attr->DecRef(); } else @@ -4779,21 +5257,13 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) m_inOnKeyDown = FALSE; } - void wxGrid::OnEraseBackground(wxEraseEvent&) { } void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) { - if ( SendEvent( wxEVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) ) - { - // the event has been intercepted - do nothing - return; - } - - if ( m_displayed && - m_currentCellCoords != wxGridNoCellCoords ) + if ( m_currentCellCoords != wxGridNoCellCoords ) { HideCellEditControl(); DisableCellEditControl(); @@ -4809,22 +5279,23 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) m_currentCellCoords = coords; - if ( m_displayed ) - { - wxClientDC dc(m_gridWin); - PrepareDC(dc); + wxClientDC dc(m_gridWin); + PrepareDC(dc); - wxGridCellAttr* attr = GetCellAttr(coords); - DrawCellHighlight(dc, attr); - attr->DecRef(); + wxGridCellAttr* attr = GetCellAttr(coords); + DrawCellHighlight(dc, attr); + attr->DecRef(); +#if 0 + // SN: For my extended selection code, automatic + // deselection is definitely not a good idea. if ( IsSelection() ) { wxRect r( SelectionToDeviceRect() ); ClearSelection(); if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r ); } - } +#endif } @@ -4944,15 +5415,17 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) // if the editor is shown, we should use it and not the renderer if ( isCurrent && IsCellEditControlEnabled() ) { - attr->GetEditor(this, row, col)->PaintBackground(rect, attr); + wxGridCellEditor *editor = attr->GetEditor(this, row, col); + editor->PaintBackground(rect, attr); + editor->DecRef(); } else { // but all the rest is drawn by the cell renderer and hence may be // customized - attr->GetRenderer(this, row, col)-> - Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords)); - + wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col); + renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords)); + renderer->DecRef(); } attr->DecRef(); @@ -5025,6 +5498,15 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) void wxGrid::DrawHighlight(wxDC& dc) { + // This if block was previously in wxGrid::OnPaint but that doesn't + // seem to get called under wxGTK - MB + // + if ( m_currentCellCoords == wxGridNoCellCoords && + m_numRows && m_numCols ) + { + m_currentCellCoords.Set(0, 0); + } + if ( IsCellEditControlEnabled() ) { // don't show highlight when the edit control is shown @@ -5051,7 +5533,7 @@ void wxGrid::DrawHighlight(wxDC& dc) // This is used to redraw all grid lines e.g. when the grid line colour // has been changed // -void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) +void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) ) { if ( !m_gridLinesEnabled || !m_numRows || @@ -5281,7 +5763,7 @@ void wxGrid::DrawTextRectangle( wxDC& dc, for ( size_t i = 0; i < lines.GetCount(); i++ ) { - dc.DrawText( lines[i], (long)x, (long)y ); + dc.DrawText( lines[i], (int)x, (int)y ); y += lineHeight; } } @@ -5465,10 +5947,12 @@ void wxGrid::ShowCellEditControl() } editor->Show( TRUE, attr ); - + editor->SetSize( rect ); editor->BeginEdit(row, col, this); + + editor->DecRef(); attr->DecRef(); } } @@ -5483,7 +5967,9 @@ void wxGrid::HideCellEditControl() int col = m_currentCellCoords.GetCol(); wxGridCellAttr* attr = GetCellAttr(row, col); - attr->GetEditor(this, row, col)->Show( FALSE ); + wxGridCellEditor *editor = attr->GetEditor(this, row, col); + editor->Show( FALSE ); + editor->DecRef(); attr->DecRef(); m_gridWin->SetFocus(); } @@ -5501,6 +5987,7 @@ void wxGrid::SaveEditControlValue() wxGridCellEditor* editor = attr->GetEditor(this, row, col); bool changed = editor->EndEdit(row, col, this); + editor->DecRef(); attr->DecRef(); if (changed) @@ -5742,17 +6229,28 @@ void wxGrid::MakeCellVisible( int row, int col ) // ------ Grid cursor movement functions // -bool wxGrid::MoveCursorUp() +bool wxGrid::MoveCursorUp( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetRow() > 0 ) { - MakeCellVisible( m_currentCellCoords.GetRow() - 1, - m_currentCellCoords.GetCol() ); - - SetCurrentCell( m_currentCellCoords.GetRow() - 1, - m_currentCellCoords.GetCol() ); - + if ( expandSelection ) + { + if ( m_selectingKeyboard == wxGridNoCellCoords ) + m_selectingKeyboard = m_currentCellCoords; + m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 ); + MakeCellVisible( m_selectingKeyboard.GetRow(), + m_selectingKeyboard.GetCol() ); + SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + MakeCellVisible( m_currentCellCoords.GetRow() - 1, + m_currentCellCoords.GetCol() ); + SetCurrentCell( m_currentCellCoords.GetRow() - 1, + m_currentCellCoords.GetCol() ); + } return TRUE; } @@ -5760,19 +6258,28 @@ bool wxGrid::MoveCursorUp() } -bool wxGrid::MoveCursorDown() +bool wxGrid::MoveCursorDown( bool expandSelection ) { - // TODO: allow for scrolling - // if ( m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetRow() < m_numRows-1 ) { - MakeCellVisible( m_currentCellCoords.GetRow() + 1, - m_currentCellCoords.GetCol() ); - - SetCurrentCell( m_currentCellCoords.GetRow() + 1, - m_currentCellCoords.GetCol() ); - + if ( expandSelection ) + { + if ( m_selectingKeyboard == wxGridNoCellCoords ) + m_selectingKeyboard = m_currentCellCoords; + m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 ); + MakeCellVisible( m_selectingKeyboard.GetRow(), + m_selectingKeyboard.GetCol() ); + SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + MakeCellVisible( m_currentCellCoords.GetRow() + 1, + m_currentCellCoords.GetCol() ); + SetCurrentCell( m_currentCellCoords.GetRow() + 1, + m_currentCellCoords.GetCol() ); + } return TRUE; } @@ -5780,17 +6287,28 @@ bool wxGrid::MoveCursorDown() } -bool wxGrid::MoveCursorLeft() +bool wxGrid::MoveCursorLeft( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetCol() > 0 ) { - MakeCellVisible( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() - 1 ); - - SetCurrentCell( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() - 1 ); - + if ( expandSelection ) + { + if ( m_selectingKeyboard == wxGridNoCellCoords ) + m_selectingKeyboard = m_currentCellCoords; + m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 ); + MakeCellVisible( m_selectingKeyboard.GetRow(), + m_selectingKeyboard.GetCol() ); + SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + MakeCellVisible( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() - 1 ); + SetCurrentCell( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() - 1 ); + } return TRUE; } @@ -5798,17 +6316,28 @@ bool wxGrid::MoveCursorLeft() } -bool wxGrid::MoveCursorRight() +bool wxGrid::MoveCursorRight( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && m_currentCellCoords.GetCol() < m_numCols - 1 ) { - MakeCellVisible( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() + 1 ); - - SetCurrentCell( m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() + 1 ); - + if ( expandSelection ) + { + if ( m_selectingKeyboard == wxGridNoCellCoords ) + m_selectingKeyboard = m_currentCellCoords; + m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 ); + MakeCellVisible( m_selectingKeyboard.GetRow(), + m_selectingKeyboard.GetCol() ); + SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + MakeCellVisible( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() + 1 ); + SetCurrentCell( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() + 1 ); + } return TRUE; } @@ -5876,7 +6405,7 @@ bool wxGrid::MovePageDown() return FALSE; } -bool wxGrid::MoveCursorUpBlock() +bool wxGrid::MoveCursorUpBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -5923,15 +6452,23 @@ bool wxGrid::MoveCursorUpBlock() } MakeCellVisible( row, col ); - SetCurrentCell( row, col ); - + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + SetCurrentCell( row, col ); + } return TRUE; } return FALSE; } -bool wxGrid::MoveCursorDownBlock() +bool wxGrid::MoveCursorDownBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -5978,7 +6515,16 @@ bool wxGrid::MoveCursorDownBlock() } MakeCellVisible( row, col ); - SetCurrentCell( row, col ); + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + SetCurrentCell( row, col ); + } return TRUE; } @@ -5986,7 +6532,7 @@ bool wxGrid::MoveCursorDownBlock() return FALSE; } -bool wxGrid::MoveCursorLeftBlock() +bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -6033,7 +6579,16 @@ bool wxGrid::MoveCursorLeftBlock() } MakeCellVisible( row, col ); - SetCurrentCell( row, col ); + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + SetCurrentCell( row, col ); + } return TRUE; } @@ -6041,7 +6596,7 @@ bool wxGrid::MoveCursorLeftBlock() return FALSE; } -bool wxGrid::MoveCursorRightBlock() +bool wxGrid::MoveCursorRightBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -6088,7 +6643,16 @@ bool wxGrid::MoveCursorRightBlock() } MakeCellVisible( row, col ); - SetCurrentCell( row, col ); + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + SelectBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + SetCurrentCell( row, col ); + } return TRUE; } @@ -6431,7 +6995,7 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) wxGridCellRenderer *wxGrid::GetDefaultRenderer() const { - return m_defaultCellAttr->GetRenderer(NULL,0,0); + return m_defaultCellAttr->GetRenderer(NULL, 0, 0); } wxGridCellEditor *wxGrid::GetDefaultEditor() const @@ -6447,7 +7011,7 @@ wxColour wxGrid::GetCellBackgroundColour(int row, int col) { wxGridCellAttr *attr = GetCellAttr(row, col); wxColour colour = attr->GetBackgroundColour(); - attr->SafeDecRef(); + attr->DecRef(); return colour; } @@ -6455,7 +7019,7 @@ wxColour wxGrid::GetCellTextColour( int row, int col ) { wxGridCellAttr *attr = GetCellAttr(row, col); wxColour colour = attr->GetTextColour(); - attr->SafeDecRef(); + attr->DecRef(); return colour; } @@ -6463,7 +7027,7 @@ wxFont wxGrid::GetCellFont( int row, int col ) { wxGridCellAttr *attr = GetCellAttr(row, col); wxFont font = attr->GetFont(); - attr->SafeDecRef(); + attr->DecRef(); return font; } @@ -6471,7 +7035,7 @@ void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) { wxGridCellAttr *attr = GetCellAttr(row, col); attr->GetAlignment(horiz, vert); - attr->SafeDecRef(); + attr->DecRef(); } wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) @@ -6479,6 +7043,7 @@ wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); attr->DecRef(); + return renderer; } @@ -6487,6 +7052,7 @@ wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col); attr->DecRef(); + return editor; } @@ -6516,7 +7082,7 @@ void wxGrid::ClearAttrCache() { if ( m_attrCache.row != -1 ) { - m_attrCache.attr->SafeDecRef(); + wxSafeDecRef(m_attrCache.attr); m_attrCache.row = -1; } } @@ -6529,7 +7095,7 @@ void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const self->m_attrCache.row = row; self->m_attrCache.col = col; self->m_attrCache.attr = attr; - attr->SafeIncRef(); + wxSafeIncRef(attr); } bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const @@ -6537,7 +7103,7 @@ bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const if ( row == m_attrCache.row && col == m_attrCache.col ) { *attr = m_attrCache.attr; - (*attr)->SafeIncRef(); + wxSafeIncRef(m_attrCache.attr); #ifdef DEBUG_ATTR_CACHE gs_nAttrCacheHits++; @@ -6601,6 +7167,40 @@ wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const return attr; } +// ---------------------------------------------------------------------------- +// setting column attributes (wrappers around SetColAttr) +// ---------------------------------------------------------------------------- + +void wxGrid::SetColFormatBool(int col) +{ + SetColFormatCustom(col, wxGRID_VALUE_BOOL); +} + +void wxGrid::SetColFormatNumber(int col) +{ + SetColFormatCustom(col, wxGRID_VALUE_NUMBER); +} + +void wxGrid::SetColFormatFloat(int col, int width, int precision) +{ + wxString typeName = wxGRID_VALUE_FLOAT; + if ( (width != -1) || (precision != -1) ) + { + typeName << _T(':') << width << _T(',') << precision; + } + + SetColFormatCustom(col, typeName); +} + +void wxGrid::SetColFormatCustom(int col, const wxString& typeName) +{ + wxGridCellAttr *attr = new wxGridCellAttr; + wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName); + attr->SetRenderer(renderer); + + SetColAttr(col, attr); +} + // ---------------------------------------------------------------------------- // setting cell attributes: this is forwarded to the table // ---------------------------------------------------------------------------- @@ -6613,7 +7213,7 @@ void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) } else { - attr->SafeDecRef(); + wxSafeDecRef(attr); } } @@ -6625,7 +7225,7 @@ void wxGrid::SetColAttr(int col, wxGridCellAttr *attr) } else { - attr->SafeDecRef(); + wxSafeDecRef(attr); } } @@ -6726,24 +7326,28 @@ wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const wxGridCellEditor* wxGrid::GetDefaultEditorForType(const wxString& typeName) const { - int index = m_typeRegistry->FindDataType(typeName); - if (index == -1) { - // Should we force the failure here or let it fallback to string handling??? - // wxFAIL_MSG(wxT("Unknown data type name")); + int index = m_typeRegistry->FindOrCloneDataType(typeName); + if ( index == wxNOT_FOUND ) + { + wxFAIL_MSG(wxT("Unknown data type name")); + return NULL; } + return m_typeRegistry->GetEditor(index); } wxGridCellRenderer* wxGrid::GetDefaultRendererForType(const wxString& typeName) const { - int index = m_typeRegistry->FindDataType(typeName); - if (index == -1) { - // Should we force the failure here or let it fallback to string handling??? - // wxFAIL_MSG(wxT("Unknown data type name")); + int index = m_typeRegistry->FindOrCloneDataType(typeName); + if ( index == wxNOT_FOUND ) + { + wxFAIL_MSG(wxT("Unknown data type name")); + return NULL; } + return m_typeRegistry->GetRenderer(index); } @@ -6842,100 +7446,170 @@ void wxGrid::SetColSize( int col, int width ) void wxGrid::SetColMinimalWidth( int col, int width ) { - m_colMinWidths.Put(col, (wxObject *)width); + m_colMinWidths.Put(col, width); +} + +void wxGrid::SetRowMinimalHeight( int row, int width ) +{ + m_rowMinHeights.Put(row, width); } int wxGrid::GetColMinimalWidth(int col) const { - wxObject *obj = m_colMinWidths.Get(m_dragRowOrCol); - return obj ? (int)obj : WXGRID_MIN_COL_WIDTH; + long value = m_colMinWidths.Get(col); + return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH; +} + +int wxGrid::GetRowMinimalHeight(int row) const +{ + long value = m_rowMinHeights.Get(row); + return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT; } // ---------------------------------------------------------------------------- // auto sizing // ---------------------------------------------------------------------------- -void wxGrid::AutoSizeColumn( int col, bool setAsMin ) +void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) { wxClientDC dc(m_gridWin); - wxCoord width, widthMax = 0; - for ( int row = 0; row < m_numRows; row++ ) + // init both of them to avoid compiler warnings, even if weo nly need one + int row = -1, + col = -1; + if ( column ) + col = colOrRow; + else + row = colOrRow; + + wxCoord extent, extentMax = 0; + int max = column ? m_numRows : m_numCols; + for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ ) { + if ( column ) + row = rowOrCol; + else + col = rowOrCol; + wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); if ( renderer ) { - width = renderer->GetBestSize(*this, *attr, dc, row, col).x; - if ( width > widthMax ) + wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col); + extent = column ? size.x : size.y; + if ( extent > extentMax ) { - widthMax = width; + extentMax = extent; } + + renderer->DecRef(); } attr->DecRef(); } - // now also compare with the column label width + // now also compare with the column label extent + wxCoord w, h; dc.SetFont( GetLabelFont() ); - dc.GetTextExtent( GetColLabelValue(col), &width, NULL ); - if ( width > widthMax ) + + if ( column ) + dc.GetTextExtent( GetColLabelValue(col), &w, &h ); + else + dc.GetTextExtent( GetRowLabelValue(col), &w, &h ); + + extent = column ? w : h; + if ( extent > extentMax ) { - widthMax = width; + extentMax = extent; } - if ( !widthMax ) + if ( !extentMax ) { - // empty column - give default width (notice that if widthMax is less - // than default width but != 0, it's ok) - widthMax = m_defaultColWidth; + // empty column - give default extent (notice that if extentMax is less + // than default extent but != 0, it's ok) + extentMax = column ? m_defaultColWidth : m_defaultRowHeight; } else { - // leave some space around text - widthMax += 10; + if ( column ) + { + // leave some space around text + extentMax += 10; + } } - SetColSize(col, widthMax); + if ( column ) + SetColSize(col, extentMax); + else + SetRowSize(row, extentMax); + if ( setAsMin ) { - SetColMinimalWidth(col, widthMax); + if ( column ) + SetColMinimalWidth(col, extentMax); + else + SetRowMinimalHeight(row, extentMax); } } -void wxGrid::AutoSizeColumns( bool setAsMin ) +int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) { int width = m_rowLabelWidth; for ( int col = 0; col < m_numCols; col++ ) { - AutoSizeColumn(col, setAsMin); + if ( !calcOnly ) + { + AutoSizeColumn(col, setAsMin); + } width += GetColWidth(col); } - // also set the grid size to just fit the columns - SetSize(width, -1); + return width; } -void wxGrid::AutoSizeRows(bool WXUNUSED(setAsMin)) +int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) { int height = m_colLabelHeight; for ( int row = 0; row < m_numRows; row++ ) { - // AutoSizeRow(row, setAsMin) -- TODO + if ( !calcOnly ) + { + AutoSizeRow(row, setAsMin); + } height += GetRowHeight(row); } - SetSize(-1, height); + return height; } void wxGrid::AutoSize() { - AutoSizeColumns(); - AutoSizeRows(); + // set the size too + SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE)); +} + +wxSize wxGrid::DoGetBestSize() const +{ + // don't set sizes, only calculate them + wxGrid *self = (wxGrid *)this; // const_cast + + return wxSize(self->SetOrCalcColumnSizes(TRUE), + self->SetOrCalcRowSizes(TRUE)); +} + +void wxGrid::Fit() +{ + AutoSize(); +} + + +wxPen& wxGrid::GetDividerPen() const +{ + return wxNullPen; } // ---------------------------------------------------------------------------- @@ -6971,167 +7645,19 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s ) void wxGrid::SelectRow( int row, bool addToSelected ) { - wxRect r; - - if ( IsSelection() && addToSelected ) - { - wxRect rect[4]; - bool need_refresh[4]; - need_refresh[0] = - need_refresh[1] = - need_refresh[2] = - need_refresh[3] = FALSE; - - int i; - - wxCoord oldLeft = m_selectedTopLeft.GetCol(); - wxCoord oldTop = m_selectedTopLeft.GetRow(); - wxCoord oldRight = m_selectedBottomRight.GetCol(); - wxCoord oldBottom = m_selectedBottomRight.GetRow(); - - if ( oldTop > row ) - { - need_refresh[0] = TRUE; - rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ), - wxGridCellCoords ( oldTop - 1, - m_numCols - 1 ) ); - m_selectedTopLeft.SetRow( row ); - } - - if ( oldLeft > 0 ) - { - need_refresh[1] = TRUE; - rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ), - wxGridCellCoords ( oldBottom, - oldLeft - 1 ) ); - - m_selectedTopLeft.SetCol( 0 ); - } - - if ( oldBottom < row ) - { - need_refresh[2] = TRUE; - rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ), - wxGridCellCoords ( row, - m_numCols - 1 ) ); - m_selectedBottomRight.SetRow( row ); - } - - if ( oldRight < m_numCols - 1 ) - { - need_refresh[3] = TRUE; - rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop , - oldRight + 1 ), - wxGridCellCoords ( oldBottom, - m_numCols - 1 ) ); - m_selectedBottomRight.SetCol( m_numCols - 1 ); - } - - for (i = 0; i < 4; i++ ) - if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( FALSE, &(rect[i]) ); - } - else - { - r = SelectionToDeviceRect(); + if ( IsSelection() && !addToSelected ) ClearSelection(); - 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( FALSE, &r ); - } - wxGridRangeSelectEvent gridEvt( GetId(), - wxEVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); - - GetEventHandler()->ProcessEvent(gridEvt); + m_selection->SelectRow( row ); } void wxGrid::SelectCol( int col, bool addToSelected ) { - if ( IsSelection() && addToSelected ) - { - wxRect rect[4]; - bool need_refresh[4]; - need_refresh[0] = - need_refresh[1] = - need_refresh[2] = - need_refresh[3] = FALSE; - int i; - - wxCoord oldLeft = m_selectedTopLeft.GetCol(); - wxCoord oldTop = m_selectedTopLeft.GetRow(); - wxCoord oldRight = m_selectedBottomRight.GetCol(); - wxCoord oldBottom = m_selectedBottomRight.GetRow(); - - if ( oldLeft > col ) - { - need_refresh[0] = TRUE; - rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ), - wxGridCellCoords ( m_numRows - 1, - oldLeft - 1 ) ); - m_selectedTopLeft.SetCol( col ); - } - - if ( oldTop > 0 ) - { - need_refresh[1] = TRUE; - rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ), - wxGridCellCoords ( oldTop - 1, - oldRight ) ); - m_selectedTopLeft.SetRow( 0 ); - } - - if ( oldRight < col ) - { - need_refresh[2] = TRUE; - rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ), - wxGridCellCoords ( m_numRows - 1, - col ) ); - m_selectedBottomRight.SetCol( col ); - } - - if ( oldBottom < m_numRows - 1 ) - { - need_refresh[3] = TRUE; - rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, - oldLeft ), - wxGridCellCoords ( m_numRows - 1, - oldRight ) ); - m_selectedBottomRight.SetRow( m_numRows - 1 ); - } - - for (i = 0; i < 4; i++ ) - if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( FALSE, &(rect[i]) ); - } - else - { - wxRect r; - - r = SelectionToDeviceRect(); + if ( IsSelection() && !addToSelected ) ClearSelection(); - 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( FALSE, &r ); - } - wxGridRangeSelectEvent gridEvt( GetId(), - wxEVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); - - GetEventHandler()->ProcessEvent(gridEvt); + m_selection->SelectCol( col ); } @@ -7157,8 +7683,8 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) updateTopLeft = wxGridCellCoords( topRow, leftCol ); updateBottomRight = wxGridCellCoords( bottomRow, rightCol ); - if ( m_selectedTopLeft != updateTopLeft || - m_selectedBottomRight != updateBottomRight ) + if ( m_selectingTopLeft != updateTopLeft || + m_selectingBottomRight != updateBottomRight ) { // Compute two optimal update rectangles: // Either one rectangle is a real subset of the @@ -7172,10 +7698,10 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) int i; // Store intermediate values - wxCoord oldLeft = m_selectedTopLeft.GetCol(); - wxCoord oldTop = m_selectedTopLeft.GetRow(); - wxCoord oldRight = m_selectedBottomRight.GetCol(); - wxCoord oldBottom = m_selectedBottomRight.GetRow(); + wxCoord oldLeft = m_selectingTopLeft.GetCol(); + wxCoord oldTop = m_selectingTopLeft.GetRow(); + wxCoord oldRight = m_selectingBottomRight.GetCol(); + wxCoord oldBottom = m_selectingBottomRight.GetRow(); // Determine the outer/inner coordinates. if (oldLeft > leftCol) @@ -7245,8 +7771,8 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) // Change Selection - m_selectedTopLeft = updateTopLeft; - m_selectedBottomRight = updateBottomRight; + m_selectingTopLeft = updateTopLeft; + m_selectingBottomRight = updateBottomRight; // various Refresh() calls for (i = 0; i < 4; i++ ) @@ -7254,34 +7780,36 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) m_gridWin->Refresh( FALSE, &(rect[i]) ); } - // only generate an event if the block is not being selected by - // dragging the mouse (in which case the event will be generated in - // the mouse event handler) - if ( !m_isDragging ) - { - wxGridRangeSelectEvent gridEvt( GetId(), - wxEVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); - - GetEventHandler()->ProcessEvent(gridEvt); - } + // never generate an event as it will be generated from + // wxGridSelection::SelectBlock! } void wxGrid::SelectAll() { - m_selectedTopLeft.Set( 0, 0 ); - m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 ); + m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); +} - m_gridWin->Refresh(); +bool wxGrid::IsSelection() +{ + return ( m_selection->IsSelection() || + ( m_selectingTopLeft != wxGridNoCellCoords && + m_selectingBottomRight != wxGridNoCellCoords ) ); } +bool wxGrid::IsInSelection( int row, int col ) +{ + return ( m_selection->IsInSelection( row, col ) || + ( row >= m_selectingTopLeft.GetRow() && + col >= m_selectingTopLeft.GetCol() && + row <= m_selectingBottomRight.GetRow() && + col <= m_selectingBottomRight.GetCol() ) ); +} void wxGrid::ClearSelection() { - m_selectedTopLeft = wxGridNoCellCoords; - m_selectedBottomRight = wxGridNoCellCoords; + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; + m_selection->ClearSelection(); } @@ -7340,7 +7868,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent ) wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj, - int row, int col, int x, int y, + int row, int col, int x, int y, bool sel, bool control, bool shift, bool alt, bool meta ) : wxNotifyEvent( type, id ) { @@ -7348,6 +7876,7 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj, m_col = col; m_x = x; m_y = y; + m_selecting = sel; m_control = control; m_shift = shift; m_alt = alt; @@ -7381,11 +7910,13 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent ) wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj, const wxGridCellCoords& topLeft, const wxGridCellCoords& bottomRight, - bool control, bool shift, bool alt, bool meta ) + bool sel, bool control, + bool shift, bool alt, bool meta ) : wxNotifyEvent( type, id ) { m_topLeft = topLeft; m_bottomRight = bottomRight; + m_selecting = sel; m_control = control; m_shift = shift; m_alt = alt; @@ -7396,4 +7927,3 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec #endif // ifndef wxUSE_NEW_GRID -