X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ca6a5f04692678cd2d9f3ea0843fc3f5a0b254f..6cc687bfee071b5328f9e48d1708795287006bb7:/src/generic/grid.cpp?ds=inline diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index baed28017d..101e6cf372 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -2,7 +2,7 @@ // Name: generic/grid.cpp // Purpose: wxGrid and related classes // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) -// Modified by: +// Modified by: Robin Dunn, Vadim Zeitlin // Created: 1/08/1999 // RCS-ID: $Id$ // Copyright: (c) Michael Bedward (mbedward@ozemail.com.au) @@ -30,9 +30,11 @@ #pragma hdrstop #endif +#if wxUSE_GRID + #if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID) -#include "gridg.cpp" -#else + #include "gridg.cpp" +#else // wxUSE_NEW_GRID #ifndef WX_PRECOMP #include "wx/utils.h" @@ -96,6 +98,27 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); WX_DEFINE_OBJARRAY(wxGridCellCoordsArray) WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray) +// ---------------------------------------------------------------------------- +// events +// ---------------------------------------------------------------------------- + +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE) +DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE) +DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE) +DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL) +DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN) +DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN) +DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED) + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -112,6 +135,7 @@ private: void OnPaint( wxPaintEvent& event ); void OnMouseEvent( wxMouseEvent& event ); + void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); @@ -132,6 +156,7 @@ private: void OnPaint( wxPaintEvent &event ); void OnMouseEvent( wxMouseEvent& event ); + void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); @@ -151,6 +176,7 @@ private: wxGrid *m_owner; void OnMouseEvent( wxMouseEvent& event ); + void OnMouseWheel( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); void OnKeyUp( wxKeyEvent& ); void OnPaint( wxPaintEvent& event ); @@ -159,7 +185,7 @@ private: DECLARE_EVENT_TABLE() }; -class WXDLLEXPORT wxGridWindow : public wxPanel +class WXDLLEXPORT wxGridWindow : public wxWindow { public: wxGridWindow() @@ -183,6 +209,7 @@ private: wxGridColLabelWindow *m_colLabelWin; void OnPaint( wxPaintEvent &event ); + void OnMouseWheel( wxMouseEvent& event ); void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& ); void OnKeyUp( wxKeyEvent& ); @@ -354,13 +381,38 @@ 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; +// TODO: this doesn't work at all, grid cells have different sizes and approx +// calculations don't work as because of the size mismatch scrollbars +// sometimes fail to be shown when they should be or vice versa +// +// The scroll bars may be a little flakey once in a while, but that is +// surely much less horrible than having scroll lines of only 1!!! +// -- Robin +// +// Well, it's still seriously broken so it might be better but needs +// fixing anyhow +// -- Vadim +static const size_t GRID_SCROLL_LINE_X = 15; // 1; +static const size_t GRID_SCROLL_LINE_Y = GRID_SCROLL_LINE_X; // the size of hash tables used a bit everywhere (the max number of elements // in these hash tables is the number of rows/columns) static const int GRID_HASH_SIZE = 100; +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + +static inline int GetScrollX(int x) +{ + return (x + GRID_SCROLL_LINE_X - 1) / GRID_SCROLL_LINE_X; +} + +static inline int GetScrollY(int y) +{ + return (y + GRID_SCROLL_LINE_Y - 1) / GRID_SCROLL_LINE_Y; +} + // ============================================================================ // implementation // ============================================================================ @@ -474,7 +526,7 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event) bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) { // accept the simple key presses, not anything with Ctrl/Alt/Meta - return !event.HasModifiers(); + return !(event.ControlDown() || event.AltDown()); } void wxGridCellEditor::StartingKey(wxKeyEvent& event) @@ -486,6 +538,8 @@ void wxGridCellEditor::StartingClick() { } +#if wxUSE_TEXTCTRL + // ---------------------------------------------------------------------------- // wxGridCellTextEditor // ---------------------------------------------------------------------------- @@ -502,7 +556,8 @@ void wxGridCellTextEditor::Create(wxWindow* parent, m_control = new wxTextCtrl(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize #if defined(__WXMSW__) - , wxTE_MULTILINE | wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL + , wxTE_PROCESS_TAB | wxTE_MULTILINE | + wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL #endif ); @@ -538,9 +593,9 @@ void wxGridCellTextEditor::SetSize(const wxRect& rectOrig) } #else // !GTK int extra_x = ( rect.x > 2 )? 2 : 1; - -// MB: treat MSW separately here otherwise the caret doesn't show -// when the editor is in the first row. + +// MB: treat MSW separately here otherwise the caret doesn't show +// when the editor is in the first row. #if defined(__WXMSW__) int extra_y = 2; #else @@ -653,73 +708,7 @@ bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event) void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) { - // we don't check for !HasModifiers() because IsAcceptedKey() did it - - // insert the key in the control - wxChar ch; - int keycode = event.GetKeyCode(); - switch ( keycode ) - { - case WXK_NUMPAD0: - case WXK_NUMPAD1: - case WXK_NUMPAD2: - case WXK_NUMPAD3: - case WXK_NUMPAD4: - case WXK_NUMPAD5: - case WXK_NUMPAD6: - case WXK_NUMPAD7: - case WXK_NUMPAD8: - case WXK_NUMPAD9: - ch = _T('0') + keycode - WXK_NUMPAD0; - break; - - case WXK_MULTIPLY: - case WXK_NUMPAD_MULTIPLY: - ch = _T('*'); - break; - - case WXK_ADD: - case WXK_NUMPAD_ADD: - ch = _T('+'); - break; - - case WXK_SUBTRACT: - case WXK_NUMPAD_SUBTRACT: - ch = _T('-'); - break; - - case WXK_DECIMAL: - case WXK_NUMPAD_DECIMAL: - ch = _T('.'); - break; - - case WXK_DIVIDE: - case WXK_NUMPAD_DIVIDE: - ch = _T('/'); - break; - - default: - if ( keycode < 256 && keycode >= 0 && isprint(keycode) ) - { - // FIXME this is not going to work for non letters... - if ( !event.ShiftDown() ) - { - keycode = tolower(keycode); - } - - ch = (wxChar)keycode; - } - else - { - ch = _T('\0'); - } - } - - if ( ch ) - { - Text()->AppendText(ch); - } - else + if ( !Text()->EmulateKeyPress(event) ) { event.Skip(); } @@ -1111,6 +1100,10 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event) return FALSE; } +#endif // wxUSE_TEXTCTRL + +#if wxUSE_CHECKBOX + // ---------------------------------------------------------------------------- // wxGridCellBoolEditor // ---------------------------------------------------------------------------- @@ -1189,7 +1182,10 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) m_startValue = grid->GetTable()->GetValueAsBool(row, col); else - m_startValue = !!grid->GetTable()->GetValue(row, col); + { + wxString cellval( grid->GetTable()->GetValue(row, col) ); + m_startValue = !( !cellval || (cellval == "0") ); + } CBox()->SetValue(m_startValue); CBox()->SetFocus(); } @@ -1252,6 +1248,10 @@ bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event) return FALSE; } +#endif // wxUSE_CHECKBOX + +#if wxUSE_COMBOBOX + // ---------------------------------------------------------------------------- // wxGridCellChoiceEditor // ---------------------------------------------------------------------------- @@ -1372,6 +1372,8 @@ void wxGridCellChoiceEditor::SetParameters(const wxString& params) } } +#endif // wxUSE_COMBOBOX + // ---------------------------------------------------------------------------- // wxGridCellEditorEvtHandler // ---------------------------------------------------------------------------- @@ -1386,11 +1388,12 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) break; case WXK_TAB: - event.Skip( m_grid->ProcessEvent( event ) ); + m_grid->GetEventHandler()->ProcessEvent( event ); break; case WXK_RETURN: - if (!m_grid->ProcessEvent(event)) + case WXK_NUMPAD_ENTER: + if (!m_grid->GetEventHandler()->ProcessEvent(event)) m_editor->HandleReturn(event); break; @@ -1407,6 +1410,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) case WXK_ESCAPE: case WXK_TAB: case WXK_RETURN: + case WXK_NUMPAD_ENTER: break; default: @@ -1627,8 +1631,15 @@ wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col) { if ( m_width == -1 ) { + if ( m_precision == -1 ) + { // default width/precision m_format = _T("%f"); + } + else + { + m_format.Printf(_T("%%.%df"), m_precision); + } } else if ( m_precision == -1 ) { @@ -1642,6 +1653,7 @@ wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col) } text.Printf(m_format, val); + } //else: text already contains the string @@ -1680,8 +1692,6 @@ wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid, void wxGridCellFloatRenderer::SetParameters(const wxString& params) { - bool ok = TRUE; - if ( !params ) { // reset to defaults @@ -1694,37 +1704,34 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) if ( !!tmp ) { long width; - if ( !tmp.ToLong(&width) ) + if ( tmp.ToLong(&width) ) { - ok = FALSE; + SetWidth((int)width); } else { - SetWidth((int)width); + wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str()); + } + } tmp = params.AfterFirst(_T(',')); if ( !!tmp ) { long precision; - if ( !tmp.ToLong(&precision) ) + if ( tmp.ToLong(&precision) ) { - ok = FALSE; + SetPrecision((int)precision); } else { - SetPrecision((int)precision); - } - } - } + wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision parameter string '%s ignored"), params.c_str()); } - if ( !ok ) - { - wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string '%s ignored"), params.c_str()); } } } + // ---------------------------------------------------------------------------- // wxGridCellBoolRenderer // ---------------------------------------------------------------------------- @@ -1795,7 +1802,10 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) ) value = grid.GetTable()->GetValueAsBool(row, col); else - value = !!grid.GetTable()->GetValue(row, col); + { + wxString cellval( grid.GetTable()->GetValue(row, col) ); + value = !( !cellval || (cellval == "0") ); + } if ( value ) { @@ -1822,9 +1832,24 @@ void wxGridCellBoolRenderer::Draw(wxGrid& grid, // wxGridCellAttr // ---------------------------------------------------------------------------- +void wxGridCellAttr::Init(wxGridCellAttr *attrDefault) +{ + m_nRef = 1; + + m_isReadOnly = Unset; + + m_renderer = NULL; + m_editor = NULL; + + m_attrkind = wxGridCellAttr::Cell; + + SetDefAttr(attrDefault); +} + wxGridCellAttr *wxGridCellAttr::Clone() const { - wxGridCellAttr *attr = new wxGridCellAttr; + wxGridCellAttr *attr = new wxGridCellAttr(m_defGridAttr); + if ( HasTextColour() ) attr->SetTextColour(GetTextColour()); if ( HasBackgroundColour() ) @@ -1848,18 +1873,52 @@ wxGridCellAttr *wxGridCellAttr::Clone() const if ( IsReadOnly() ) attr->SetReadOnly(); - attr->SetDefAttr(m_defGridAttr); + attr->SetKind( m_attrkind ); return attr; } +void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) +{ + if ( !HasTextColour() && mergefrom->HasTextColour() ) + SetTextColour(mergefrom->GetTextColour()); + if ( !HasBackgroundColour() && mergefrom->HasBackgroundColour() ) + SetBackgroundColour(mergefrom->GetBackgroundColour()); + if ( !HasFont() && mergefrom->HasFont() ) + SetFont(mergefrom->GetFont()); + if ( !!HasAlignment() && mergefrom->HasAlignment() ){ + int hAlign, vAlign; + mergefrom->GetAlignment( &hAlign, &vAlign); + SetAlignment(hAlign, vAlign); + } + + // Directly access member functions as GetRender/Editor don't just return + // m_renderer/m_editor + // + // Maybe add support for merge of Render and Editor? + if (!HasRenderer() && mergefrom->HasRenderer() ) + { + m_renderer = mergefrom->m_renderer; + m_renderer->IncRef(); + } + if ( !HasEditor() && mergefrom->HasEditor() ) + { + m_editor = mergefrom->m_editor; + m_editor->IncRef(); + } + if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() ) + SetReadOnly(mergefrom->IsReadOnly()); + + SetDefAttr(mergefrom->m_defGridAttr); +} + const wxColour& wxGridCellAttr::GetTextColour() const { if (HasTextColour()) { return m_colText; } - else if (m_defGridAttr != this) + else if (m_defGridAttr && m_defGridAttr != this) { return m_defGridAttr->GetTextColour(); } @@ -1875,7 +1934,7 @@ const wxColour& wxGridCellAttr::GetBackgroundColour() const { if (HasBackgroundColour()) return m_colBack; - else if (m_defGridAttr != this) + else if (m_defGridAttr && m_defGridAttr != this) return m_defGridAttr->GetBackgroundColour(); else { @@ -1889,7 +1948,7 @@ const wxFont& wxGridCellAttr::GetFont() const { if (HasFont()) return m_font; - else if (m_defGridAttr != this) + else if (m_defGridAttr && m_defGridAttr != this) return m_defGridAttr->GetFont(); else { @@ -1906,7 +1965,7 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const if ( hAlign ) *hAlign = m_hAlign; if ( vAlign ) *vAlign = m_vAlign; } - else if (m_defGridAttr != this) + else if (m_defGridAttr && m_defGridAttr != this) m_defGridAttr->GetAlignment(hAlign, vAlign); else { @@ -1924,59 +1983,96 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const { - wxGridCellRenderer* renderer = NULL; + wxGridCellRenderer *renderer; - if ( m_defGridAttr != this || grid == NULL ) + if ( m_renderer && this != m_defGridAttr ) { - renderer = m_renderer; // use local attribute - if ( renderer ) - renderer->IncRef(); + // use the cells renderer if it has one + renderer = m_renderer; + renderer->IncRef(); } - - if ( !renderer && grid ) // get renderer for the data type + else // no non default cell renderer { - // GetDefaultRendererForCell() will do IncRef() for us - renderer = grid->GetDefaultRendererForCell(row, col); - } + // get default renderer for the data type + if ( grid ) + { + // GetDefaultRendererForCell() will do IncRef() for us + renderer = grid->GetDefaultRendererForCell(row, col); + } + else + { + renderer = NULL; + } - 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 (m_defGridAttr && this != m_defGridAttr ) + { + // 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); + } + else // default grid attr + { + // use m_renderer which we had decided not to use initially + renderer = m_renderer; + if ( renderer ) + renderer->IncRef(); + } + } } - if ( !renderer) - { - wxFAIL_MSG(wxT("Missing default cell attribute")); - } + // we're supposed to always find something + wxASSERT_MSG(renderer, wxT("Missing default cell renderer")); return renderer; } +// same as above, except for s/renderer/editor/g wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const { - wxGridCellEditor* editor = NULL; + wxGridCellEditor *editor; - if ( m_defGridAttr != this || grid == NULL ) + if ( m_editor && this != m_defGridAttr ) { - editor = m_editor; // use local attribute - if ( editor ) - editor->IncRef(); + // use the cells editor if it has one + editor = m_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 ) + else // no non default cell editor { - wxFAIL_MSG(wxT("Missing default cell attribute")); + // get default editor for the data type + if ( grid ) + { + // GetDefaultEditorForCell() will do IncRef() for us + editor = grid->GetDefaultEditorForCell(row, col); + } + else + { + editor = NULL; + } + + if ( !editor ) + { + if ( m_defGridAttr && this != m_defGridAttr ) + { + // if we still don't have one then use the grid default + // (no need for IncRef() here neither) + editor = m_defGridAttr->GetEditor(NULL, 0, 0); + } + else // default grid attr + { + // use m_editor which we had decided not to use initially + editor = m_editor; + if ( editor ) + editor->IncRef(); + } + } } + // we're supposed to always find something + wxASSERT_MSG(editor, wxT("Missing default cell editor")); + return editor; } @@ -1994,6 +2090,9 @@ void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col) } else { + // free the old attribute + m_attrs[(size_t)n].attr->DecRef(); + if ( attr ) { // change the attribute @@ -2205,28 +2304,77 @@ void wxGridCellAttrProvider::InitData() m_data = new wxGridCellAttrProviderData; } -wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const +wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col, + wxGridCellAttr::wxAttrKind kind ) 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 ) + switch(kind) { - // 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 ) + case (wxGridCellAttr::Any): + //Get cached merge attributes. + // Currenlty not used as no cache implemented as not mutiable + // attr = m_data->m_mergeAttr.GetAttr(row, col); + if(!attr) + { + //Basicaly implement old version. + //Also check merge cache, so we don't have to re-merge every time.. + wxGridCellAttr *attrcell = (wxGridCellAttr *)NULL, + *attrrow = (wxGridCellAttr *)NULL, + *attrcol = (wxGridCellAttr *)NULL; + + attrcell = m_data->m_cellAttrs.GetAttr(row, col); + attrcol = m_data->m_colAttrs.GetAttr(col); + attrrow = m_data->m_rowAttrs.GetAttr(row); + + if((attrcell != attrrow) && (attrrow !=attrcol) && (attrcell != attrcol)){ + // Two or move are non NULL + attr = new wxGridCellAttr; + attr->SetKind(wxGridCellAttr::Merged); + + //Order important.. + if(attrcell){ + attr->MergeWith(attrcell); + attrcell->DecRef(); + } + if(attrcol){ + attr->MergeWith(attrcol); + attrcol->DecRef(); + } + if(attrrow){ + attr->MergeWith(attrrow); + attrrow->DecRef(); + } + //store merge attr if cache implemented + //attr->IncRef(); + //m_data->m_mergeAttr.SetAttr(attr, row, col); + } + else { - // finally try the row attributes + // one or none is non null return it or null. + if(attrrow) attr = attrrow; + if(attrcol) attr = attrcol; + if(attrcell) attr = attrcell; + } + } + break; + case (wxGridCellAttr::Cell): + attr = m_data->m_cellAttrs.GetAttr(row, col); + break; + case (wxGridCellAttr::Col): + attr = m_data->m_colAttrs.GetAttr(col); + break; + case (wxGridCellAttr::Row): attr = m_data->m_rowAttrs.GetAttr(row); + break; + default: + // unused as yet... + // (wxGridCellAttr::Default): + // (wxGridCellAttr::Merged): + break; } } - return attr; } @@ -2327,19 +2475,24 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) { // check whether this is one of the standard ones, in which case // register it "on the fly" +#if wxUSE_TEXTCTRL if ( typeName == wxGRID_VALUE_STRING ) { RegisterDataType(wxGRID_VALUE_STRING, new wxGridCellStringRenderer, new wxGridCellTextEditor); - } - else if ( typeName == wxGRID_VALUE_BOOL ) + } else +#endif // wxUSE_TEXTCTRL +#if wxUSE_CHECKBOX + if ( typeName == wxGRID_VALUE_BOOL ) { RegisterDataType(wxGRID_VALUE_BOOL, new wxGridCellBoolRenderer, new wxGridCellBoolEditor); - } - else if ( typeName == wxGRID_VALUE_NUMBER ) + } else +#endif // wxUSE_CHECKBOX +#if wxUSE_TEXTCTRL + if ( typeName == wxGRID_VALUE_NUMBER ) { RegisterDataType(wxGRID_VALUE_NUMBER, new wxGridCellNumberRenderer, @@ -2350,14 +2503,16 @@ int wxGridTypeRegistry::FindDataType(const wxString& typeName) RegisterDataType(wxGRID_VALUE_FLOAT, new wxGridCellFloatRenderer, new wxGridCellFloatEditor); - } - else if ( typeName == wxGRID_VALUE_CHOICE ) + } else +#endif // wxUSE_TEXTCTRL +#if wxUSE_COMBOBOX + if ( typeName == wxGRID_VALUE_CHOICE ) { RegisterDataType(wxGRID_VALUE_CHOICE, new wxGridCellStringRenderer, new wxGridCellChoiceEditor); - } - else + } else +#endif // wxUSE_COMBOBOX { return wxNOT_FOUND; } @@ -2411,14 +2566,16 @@ int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName) wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index) { wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer; - renderer->IncRef(); + if (renderer) + renderer->IncRef(); return renderer; } wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) { wxGridCellEditor* editor = m_typeinfo[index]->m_editor; - editor->IncRef(); + if (editor) + editor->IncRef(); return editor; } @@ -2456,10 +2613,10 @@ bool wxGridTableBase::CanHaveAttributes() return TRUE; } -wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col) +wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind kind) { if ( m_attrProvider ) - return m_attrProvider->GetAttr(row, col); + return m_attrProvider->GetAttr(row, col, kind); else return (wxGridCellAttr *)NULL; } @@ -2468,6 +2625,7 @@ void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) { if ( m_attrProvider ) { + attr->SetKind(wxGridCellAttr::Cell); m_attrProvider->SetAttr(attr, row, col); } else @@ -2482,6 +2640,7 @@ void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row) { if ( m_attrProvider ) { + attr->SetKind(wxGridCellAttr::Row); m_attrProvider->SetRowAttr(attr, row); } else @@ -2496,6 +2655,7 @@ void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col) { if ( m_attrProvider ) { + attr->SetKind(wxGridCellAttr::Col); m_attrProvider->SetColAttr(attr, col); } else @@ -2869,7 +3029,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) { for ( n = 0; n < numRows; n++ ) { - m_data.Remove( pos ); + m_data.RemoveAt( pos ); } } if ( GetView() ) @@ -2985,7 +3145,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) { for ( n = 0; n < numCols; n++ ) { - m_data[row].Remove( pos ); + m_data[row].RemoveAt( pos ); } } } @@ -3069,6 +3229,7 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow ) BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow ) EVT_PAINT( wxGridRowLabelWindow::OnPaint ) + EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel) EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown ) EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp ) @@ -3096,8 +3257,8 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); dc.SetDeviceOrigin( 0, -y ); - m_owner->CalcRowLabelsExposed( GetUpdateRegion() ); - m_owner->DrawRowLabels( dc ); + wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() ); + m_owner->DrawRowLabels( dc , rows ); } @@ -3107,17 +3268,23 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) } +void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event ) +{ + m_owner->GetEventHandler()->ProcessEvent(event); +} + + // This seems to be required for wxMotif otherwise the mouse // cursor must be in the cell edit control to get key events // void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -3128,6 +3295,7 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow ) BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow ) EVT_PAINT( wxGridColLabelWindow::OnPaint ) + EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel) EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown ) EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp ) @@ -3155,8 +3323,8 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); dc.SetDeviceOrigin( -x, 0 ); - m_owner->CalcColLabelsExposed( GetUpdateRegion() ); - m_owner->DrawColLabels( dc ); + wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() ); + m_owner->DrawColLabels( dc , cols ); } @@ -3165,18 +3333,23 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) m_owner->ProcessColLabelMouseEvent( event ); } +void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event ) +{ + m_owner->GetEventHandler()->ProcessEvent(event); +} + // This seems to be required for wxMotif otherwise the mouse // cursor must be in the cell edit control to get key events // void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -3186,6 +3359,7 @@ void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow ) BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow ) + EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel) EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent ) EVT_PAINT( wxGridCornerLabelWindow::OnPaint) EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown ) @@ -3224,27 +3398,33 @@ void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) } +void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event ) +{ + m_owner->GetEventHandler()->ProcessEvent(event); +} + // This seems to be required for wxMotif otherwise the mouse // cursor must be in the cell edit control to get key events // void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } ////////////////////////////////////////////////////////////////////// -IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel ) +IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow ) -BEGIN_EVENT_TABLE( wxGridWindow, wxPanel ) +BEGIN_EVENT_TABLE( wxGridWindow, wxWindow ) EVT_PAINT( wxGridWindow::OnPaint ) + EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel) EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridWindow::OnKeyDown ) EVT_KEY_UP( wxGridWindow::OnKeyUp ) @@ -3255,12 +3435,12 @@ wxGridWindow::wxGridWindow( wxGrid *parent, wxGridRowLabelWindow *rowLblWin, wxGridColLabelWindow *colLblWin, wxWindowID id, const wxPoint &pos, const wxSize &size ) - : wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS, "grid window" ) { m_owner = parent; m_rowLabelWin = rowLblWin; m_colLabelWin = colLblWin; - SetBackgroundColour( "WHITE" ); + SetBackgroundColour(_T("WHITE")); } @@ -3274,19 +3454,19 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxPaintDC dc( this ); m_owner->PrepareDC( dc ); wxRegion reg = GetUpdateRegion(); - m_owner->CalcCellsExposed( reg ); - m_owner->DrawGridCellArea( dc ); + wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg ); + m_owner->DrawGridCellArea( dc , DirtyCells); #if WXGRID_DRAW_LINES m_owner->DrawAllGridLines( dc, reg ); #endif m_owner->DrawGridSpace( dc ); - m_owner->DrawHighlight( dc ); + m_owner->DrawHighlight( dc , DirtyCells ); } void wxGridWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) { - wxPanel::ScrollWindow( dx, dy, rect ); + wxWindow::ScrollWindow( dx, dy, rect ); m_rowLabelWin->ScrollWindow( 0, dy, rect ); m_colLabelWin->ScrollWindow( dx, 0, rect ); } @@ -3297,18 +3477,22 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) m_owner->ProcessGridCellMouseEvent( event ); } +void wxGridWindow::OnMouseWheel( wxMouseEvent& event ) +{ + m_owner->GetEventHandler()->ProcessEvent(event); +} // This seems to be required for wxMotif/wxGTK otherwise the mouse // cursor must be in the cell edit control to get key events // void wxGridWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridWindow::OnKeyUp( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) @@ -3345,6 +3529,8 @@ wxGrid::wxGrid( wxWindow *parent, wxGrid::~wxGrid() { + // Must do this or ~wxScrollHelper will pop the wrong event handler + SetTargetWindow(this); ClearAttrCache(); wxSafeDecRef(m_defaultCellAttr); @@ -3377,16 +3563,17 @@ void wxGrid::Create() m_cellEditCtrlEnabled = FALSE; - m_defaultCellAttr = new wxGridCellAttr; - m_defaultCellAttr->SetDefAttr(m_defaultCellAttr); + m_defaultCellAttr = new wxGridCellAttr(); // Set default cell attributes + m_defaultCellAttr->SetDefAttr(m_defaultCellAttr); + m_defaultCellAttr->SetKind(wxGridCellAttr::Default); m_defaultCellAttr->SetFont(GetFont()); m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP); m_defaultCellAttr->SetTextColour( - wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT)); + wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); m_defaultCellAttr->SetBackgroundColour( - wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer); m_defaultCellAttr->SetEditor(new wxGridCellTextEditor); @@ -3425,6 +3612,8 @@ void wxGrid::Create() wxDefaultSize ); SetTargetWindow( m_gridWin ); + + Init(); } @@ -3442,7 +3631,9 @@ bool wxGrid::CreateGrid( int numRows, int numCols, m_table->SetView( this ); m_ownTable = TRUE; m_selection = new wxGridSelection( this, selmode ); - Init(); + + CalcDimensions(); + m_created = TRUE; return m_created; @@ -3450,12 +3641,10 @@ bool wxGrid::CreateGrid( int numRows, int numCols, void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode) { - if ( !m_created ) - { - wxFAIL_MSG( wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") ); - } - else - m_selection->SetSelectionMode( selmode ); + wxCHECK_RET( m_created, + wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") ); + + m_selection->SetSelectionMode( selmode ); } bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, @@ -3482,7 +3671,9 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, if (takeOwnership) m_ownTable = TRUE; m_selection = new wxGridSelection( this, selmode ); - Init(); + + CalcDimensions(); + m_created = TRUE; } @@ -3532,6 +3723,8 @@ void wxGrid::Init() m_gridLineColour = wxColour( 128, 128, 255 ); m_gridLinesEnabled = TRUE; m_cellHighlightColour = m_gridLineColour; + m_cellHighlightPenWidth = 2; + m_cellHighlightROPenWidth = 1; m_cursorMode = WXGRID_CURSOR_SELECT_CELL; m_winCapture = (wxWindow *)NULL; @@ -3552,8 +3745,8 @@ void wxGrid::Init() m_selectingTopLeft = wxGridNoCellCoords; m_selectingBottomRight = wxGridNoCellCoords; - m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); - m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT); + m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); + m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); m_editable = TRUE; // default for whole grid @@ -3561,9 +3754,7 @@ void wxGrid::Init() m_batchCount = 0; m_extraWidth = - m_extraHeight = 50; - - CalcDimensions(); + m_extraHeight = 0; } // ---------------------------------------------------------------------------- @@ -3648,19 +3839,46 @@ void wxGrid::CalcDimensions() int cw, ch; GetClientSize( &cw, &ch ); - if ( m_numRows > 0 || m_numCols > 0 ) + if ( m_rowLabelWin->IsShown() ) + cw -= m_rowLabelWidth; + if ( m_colLabelWin->IsShown() ) + ch -= m_colLabelHeight; + + // grid total size + int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0; + int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0; + + // preserve (more or less) the previous position + int x, y; + GetViewStart( &x, &y ); + + // maybe we don't need scrollbars at all? + // + // also adjust the position to be valid for the new scroll rangs + if ( w <= cw ) + { + w = x = 0; + } + else { - int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0; - int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0; + if ( x >= w ) + x = w - 1; + } - // TODO: restore the scroll position that we had before sizing - // - int x, y; - GetViewStart( &x, &y ); - SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE, - right/GRID_SCROLL_LINE, bottom/GRID_SCROLL_LINE, - x, y ); + if ( h <= ch ) + { + h = y = 0; + } + else + { + if ( y >= h ) + y = h - 1; } + + // do set scrollbar parameters + SetScrollbars( GRID_SCROLL_LINE_X, GRID_SCROLL_LINE_Y, + GetScrollX(w), GetScrollY(h), x, y, + GetBatchCount() != 0); } @@ -3801,8 +4019,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) { for ( i = 0; i < numRows; i++ ) { - m_rowHeights.Remove( pos ); - m_rowBottoms.Remove( pos ); + m_rowHeights.RemoveAt( pos ); + m_rowBottoms.RemoveAt( pos ); } int h = 0; @@ -3825,8 +4043,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); if (attrProvider) { attrProvider->UpdateAttrRows( pos, -((int)numRows) ); -// ifdef'd out following patch from Paul Gammans -#if 0 +// ifdef'd out following patch from Paul Gammans +#if 0 // No need to touch column attributes, unless we // removed _all_ rows, in this case, we remove // all column attributes. @@ -3834,7 +4052,7 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) // needed data is not available inside UpdateAttrRows. if ( !GetNumberRows() ) attrProvider->UpdateAttrCols( 0, -GetNumberCols() ); -#endif +#endif } if ( !GetBatchCount() ) { @@ -3937,8 +4155,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) { for ( i = 0; i < numCols; i++ ) { - m_colWidths.Remove( pos ); - m_colRights.Remove( pos ); + m_colWidths.RemoveAt( pos ); + m_colRights.RemoveAt( pos ); } int w = 0; @@ -3961,8 +4179,8 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); if (attrProvider) { attrProvider->UpdateAttrCols( pos, -((int)numCols) ); -// ifdef'd out following patch from Paul Gammans -#if 0 +// ifdef'd out following patch from Paul Gammans +#if 0 // No need to touch row attributes, unless we // removed _all_ columns, in this case, we remove // all row attributes. @@ -3970,20 +4188,16 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) // needed data is not available inside UpdateAttrCols. if ( !GetNumberCols() ) attrProvider->UpdateAttrRows( 0, -GetNumberRows() ); -#endif +#endif } if ( !GetBatchCount() ) { CalcDimensions(); m_colLabelWin->Refresh(); } - return TRUE; } -#if 0 -// There is no path to this code !!!!!! - result = TRUE; + result = TRUE; break; -#endif } if (result && !GetBatchCount() ) @@ -3992,12 +4206,12 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) } -void wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) +wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; - m_rowLabelsExposed.Empty(); + wxArrayInt rowlabels; int top, bottom; while ( iter ) @@ -4033,20 +4247,22 @@ void wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) if ( GetRowTop(row) > bottom ) break; - m_rowLabelsExposed.Add( row ); + rowlabels.Add( row ); } iter++ ; } + + return rowlabels; } -void wxGrid::CalcColLabelsExposed( const wxRegion& reg ) +wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; - m_colLabelsExposed.Empty(); + wxArrayInt colLabels; int left, right; while ( iter ) @@ -4082,22 +4298,21 @@ void wxGrid::CalcColLabelsExposed( const wxRegion& reg ) if ( GetColLeft(col) > right ) break; - m_colLabelsExposed.Add( col ); + colLabels.Add( col ); } iter++ ; } + return colLabels; } -void wxGrid::CalcCellsExposed( const wxRegion& reg ) +wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; - m_cellsExposed.Empty(); - m_rowsExposed.Empty(); - m_colsExposed.Empty(); + wxGridCellCoordsArray cellsExposed; int left, top, right, bottom; while ( iter ) @@ -4134,7 +4349,6 @@ void wxGrid::CalcCellsExposed( const wxRegion& reg ) if ( GetRowTop(row) > bottom ) break; - m_rowsExposed.Add( row ); for ( col = 0; col < m_numCols; col++ ) { @@ -4144,14 +4358,14 @@ void wxGrid::CalcCellsExposed( const wxRegion& reg ) if ( GetColLeft(col) > right ) break; - if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) - m_colsExposed.Add( col ); - m_cellsExposed.Add( wxGridCellCoords( row, col ) ); + cellsExposed.Add( wxGridCellCoords( row, col ) ); } } iter++; } + + return cellsExposed; } @@ -4583,7 +4797,9 @@ void wxGrid::ChangeCursorMode(CursorMode mode, cursorModes[m_cursorMode], cursorModes[mode]); #endif // __WXDEBUG__ - if ( mode == m_cursorMode ) + if ( mode == m_cursorMode && + win == m_winCapture && + captureMouse == (m_winCapture != NULL)) return; if ( !win ) @@ -5242,68 +5458,80 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) // Generate a grid event based on a mouse event and // return the result of ProcessEvent() // -bool wxGrid::SendEvent( const wxEventType type, +int wxGrid::SendEvent( const wxEventType type, int row, int col, wxMouseEvent& mouseEv ) { - if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) - { - int rowOrCol = (row == -1 ? col : row); - - wxGridSizeEvent gridEvt( GetId(), - type, - this, - rowOrCol, - mouseEv.GetX() + GetColLabelSize(), - mouseEv.GetY() + GetRowLabelSize(), - mouseEv.ControlDown(), - mouseEv.ShiftDown(), - mouseEv.AltDown(), - mouseEv.MetaDown() ); - - return GetEventHandler()->ProcessEvent(gridEvt); - } - else if ( type == wxEVT_GRID_RANGE_SELECT ) - { - // Right now, it should _never_ end up here! - wxGridRangeSelectEvent gridEvt( GetId(), - type, - this, - m_selectingTopLeft, - m_selectingBottomRight, - TRUE, - mouseEv.ControlDown(), - mouseEv.ShiftDown(), - mouseEv.AltDown(), - mouseEv.MetaDown() ); - - return GetEventHandler()->ProcessEvent(gridEvt); - } - else - { - wxGridEvent gridEvt( GetId(), - type, - this, - row, col, - mouseEv.GetX() + GetColLabelSize(), - mouseEv.GetY() + GetRowLabelSize(), - FALSE, - mouseEv.ControlDown(), - mouseEv.ShiftDown(), - mouseEv.AltDown(), - mouseEv.MetaDown() ); - - return GetEventHandler()->ProcessEvent(gridEvt); - } + bool claimed; + bool vetoed= FALSE; + + if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) + { + int rowOrCol = (row == -1 ? col : row); + + wxGridSizeEvent gridEvt( GetId(), + type, + this, + rowOrCol, + mouseEv.GetX() + GetRowLabelSize(), + mouseEv.GetY() + GetColLabelSize(), + mouseEv.ControlDown(), + mouseEv.ShiftDown(), + mouseEv.AltDown(), + mouseEv.MetaDown() ); + + claimed = GetEventHandler()->ProcessEvent(gridEvt); + vetoed = !gridEvt.IsAllowed(); + } + else if ( type == wxEVT_GRID_RANGE_SELECT ) + { + // Right now, it should _never_ end up here! + wxGridRangeSelectEvent gridEvt( GetId(), + type, + this, + m_selectingTopLeft, + m_selectingBottomRight, + TRUE, + mouseEv.ControlDown(), + mouseEv.ShiftDown(), + mouseEv.AltDown(), + mouseEv.MetaDown() ); + + claimed = GetEventHandler()->ProcessEvent(gridEvt); + vetoed = !gridEvt.IsAllowed(); + } + else + { + wxGridEvent gridEvt( GetId(), + type, + this, + row, col, + mouseEv.GetX() + GetRowLabelSize(), + mouseEv.GetY() + GetColLabelSize(), + FALSE, + mouseEv.ControlDown(), + mouseEv.ShiftDown(), + mouseEv.AltDown(), + mouseEv.MetaDown() ); + claimed = GetEventHandler()->ProcessEvent(gridEvt); + vetoed = !gridEvt.IsAllowed(); + } + + // A Veto'd event may not be `claimed' so test this first + if (vetoed) return -1; + return claimed ? 1 : 0; } // Generate a grid event of specified type and return the result // of ProcessEvent(). // -bool wxGrid::SendEvent( const wxEventType type, +int wxGrid::SendEvent( const wxEventType type, int row, int col ) { + bool claimed; + bool vetoed= FALSE; + if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { int rowOrCol = (row == -1 ? col : row); @@ -5313,7 +5541,8 @@ bool wxGrid::SendEvent( const wxEventType type, this, rowOrCol ); - return GetEventHandler()->ProcessEvent(gridEvt); + claimed = GetEventHandler()->ProcessEvent(gridEvt); + vetoed = !gridEvt.IsAllowed(); } else { @@ -5322,8 +5551,13 @@ bool wxGrid::SendEvent( const wxEventType type, this, row, col ); - return GetEventHandler()->ProcessEvent(gridEvt); - } + claimed = GetEventHandler()->ProcessEvent(gridEvt); + vetoed = !gridEvt.IsAllowed(); + } + + // A Veto'd event may not be `claimed' so test this first + if (vetoed) return -1; + return claimed ? 1 : 0; } @@ -5333,14 +5567,14 @@ void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) ) } -// This is just here to make sure that CalcDimensions gets called when -// the grid view is resized... then the size event is skipped to allow -// the box sizers to handle everything -// -void wxGrid::OnSize( wxSizeEvent& WXUNUSED(event) ) +void wxGrid::OnSize( wxSizeEvent& event ) { + // position the child windows CalcWindowSizes(); - CalcDimensions(); + + // don't call CalcDimensions() from here, the base class handles the size + // changes itself + event.Skip(); } @@ -5413,6 +5647,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) break; case WXK_RETURN: + case WXK_NUMPAD_ENTER: if ( event.ControlDown() ) { event.Skip(); // to let the edit control have the return @@ -5531,7 +5766,14 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) || editor->IsAcceptedKey(event) ) { EnableCellEditControl(); - editor->StartingKey(event); + + // the editor could be not shown for a variety of + // reasons (i.e. blocked by the app or whatever), so + // check if it really was created + if ( m_cellEditCtrlEnabled ) + { + editor->StartingKey(event); + } } else { @@ -5599,7 +5841,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) if ( IsVisible( m_currentCellCoords, FALSE ) ) { wxRect r; - r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); + r = BlockToDeviceRect(m_currentCellCoords, coords); if ( !m_gridLinesEnabled ) { r.x--; @@ -5608,12 +5850,12 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) r.height++; } - CalcCellsExposed( r ); - + wxGridCellCoordsArray cells = CalcCellsExposed( r ); + // Otherwise refresh redraws the highlight! m_currentCellCoords = coords; - DrawGridCellArea(dc); + DrawGridCellArea(dc,cells); DrawAllGridLines( dc, r ); } } @@ -5760,7 +6002,6 @@ void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCo // (old comment from when this was the body of SelectBlock) } - // // ------ functions to get/send data (see also public functions) // @@ -5805,16 +6046,16 @@ bool wxGrid::SetModelValues() // exposed cells (usually set from the update region by // CalcExposedCells) // -void wxGrid::DrawGridCellArea( wxDC& dc ) +void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( !m_numRows || !m_numCols ) return; size_t i; - size_t numCells = m_cellsExposed.GetCount(); + size_t numCells = cells.GetCount(); for ( i = 0; i < numCells; i++ ) { - DrawCell( dc, m_cellsExposed[i] ); + DrawCell( dc, cells[i] ); } } @@ -5904,10 +6145,27 @@ void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) // hmmm... what could we do here to show that the cell is disabled? // for now, I just draw a thinner border than for the other ones, but // it doesn't look really good - dc.SetPen(wxPen(m_cellHighlightColour, attr->IsReadOnly() ? 1 : 3, wxSOLID)); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(rect); + int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth; + + if (penWidth > 0) { + + // The center of th drawn line is where the position/width/height of + // the rectangle is actually at, (on wxMSW atr least,) so we will + // reduce the size of the rectangle to compensate for the thickness of + // the line. If this is too strange on non wxMSW platforms then + // please #ifdef this appropriately. + rect.x += penWidth/2; + rect.y += penWidth/2; + rect.width -= penWidth-1; + rect.height -= penWidth-1; + + + // Now draw the rectangle + dc.SetPen(wxPen(m_cellHighlightColour, penWidth, wxSOLID)); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.DrawRectangle(rect); + } #if 0 // VZ: my experiments with 3d borders... @@ -5952,7 +6210,7 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) GetColRight(col), GetRowBottom(row) ); } -void wxGrid::DrawHighlight(wxDC& dc) +void wxGrid::DrawHighlight(wxDC& dc,const wxGridCellCoordsArray& cells) { // This if block was previously in wxGrid::OnPaint but that doesn't // seem to get called under wxGTK - MB @@ -5971,10 +6229,10 @@ void wxGrid::DrawHighlight(wxDC& dc) // if the active cell was repainted, repaint its highlight too because it // might have been damaged by the grid lines - size_t count = m_cellsExposed.GetCount(); + size_t count = cells.GetCount(); for ( size_t n = 0; n < count; n++ ) { - if ( m_cellsExposed[n] == m_currentCellCoords ) + if ( cells[n] == m_currentCellCoords ) { wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); DrawCellHighlight(dc, attr); @@ -5989,7 +6247,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 & WXUNUSED_GTK(reg) ) +void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) { if ( !m_gridLinesEnabled || !m_numRows || @@ -6066,16 +6324,16 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) ) } -void wxGrid::DrawRowLabels( wxDC& dc ) +void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) { if ( !m_numRows ) return; size_t i; - size_t numLabels = m_rowLabelsExposed.GetCount(); + size_t numLabels = rows.GetCount(); for ( i = 0; i < numLabels; i++ ) { - DrawRowLabel( dc, m_rowLabelsExposed[i] ); + DrawRowLabel( dc, rows[i] ); } } @@ -6114,16 +6372,16 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) } -void wxGrid::DrawColLabels( wxDC& dc ) +void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) { if ( !m_numCols ) return; size_t i; - size_t numLabels = m_colLabelsExposed.GetCount(); + size_t numLabels = cols.GetCount(); for ( i = 0; i < numLabels; i++ ) { - DrawColLabel( dc, m_colLabelsExposed[i] ); + DrawColLabel( dc, cols[i] ); } } @@ -6166,19 +6424,36 @@ void wxGrid::DrawColLabel( wxDC& dc, int col ) DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign ); } - void wxGrid::DrawTextRectangle( wxDC& dc, const wxString& value, const wxRect& rect, int horizAlign, int vertAlign ) { - long textWidth, textHeight; - long lineWidth, lineHeight; wxArrayString lines; dc.SetClippingRegion( rect ); StringToLines( value, lines ); + + + //Forward to new API. + DrawTextRectangle( dc, + lines, + rect, + horizAlign, + vertAlign ); + +} + +void wxGrid::DrawTextRectangle( wxDC& dc, + const wxArrayString& lines, + const wxRect& rect, + int horizAlign, + int vertAlign ) +{ + long textWidth, textHeight; + long lineWidth, lineHeight; + if ( lines.GetCount() ) { GetTextBoxSize( dc, lines, &textWidth, &textHeight ); @@ -6263,7 +6538,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) void wxGrid::GetTextBoxSize( wxDC& dc, - wxArrayString& lines, + const wxArrayString& lines, long *width, long *height ) { long w = 0; @@ -6339,11 +6614,11 @@ void wxGrid::EnableCellEditControl( bool enable ) if ( enable != m_cellEditCtrlEnabled ) { - // TODO allow the app to Veto() this event? - SendEvent(enable ? wxEVT_GRID_EDITOR_SHOWN : wxEVT_GRID_EDITOR_HIDDEN); - if ( enable ) { + if (SendEvent( wxEVT_GRID_EDITOR_SHOWN) <0) + return; + // this should be checked by the caller! wxASSERT_MSG( CanEnableCellControl(), _T("can't enable editing for this cell!") ); @@ -6355,6 +6630,9 @@ void wxGrid::EnableCellEditControl( bool enable ) } else { + //FIXME:add veto support + SendEvent( wxEVT_GRID_EDITOR_HIDDEN); + HideCellEditControl(); SaveEditControlValue(); @@ -6452,6 +6730,14 @@ void wxGrid::ShowCellEditControl() { editor->Create(m_gridWin, -1, new wxGridCellEditorEvtHandler(this, editor)); + + wxGridEditorCreatedEvent evt(GetId(), + wxEVT_GRID_EDITOR_CREATED, + this, + row, + col, + editor->GetControl()); + GetEventHandler()->ProcessEvent(evt); } editor->Show( TRUE, attr ); @@ -6493,6 +6779,8 @@ void wxGrid::SaveEditControlValue() int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); + wxString oldval = GetCellValue(row,col); + wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col); bool changed = editor->EndEdit(row, col, this); @@ -6502,9 +6790,13 @@ void wxGrid::SaveEditControlValue() if (changed) { - SendEvent( wxEVT_GRID_CELL_CHANGE, + if ( SendEvent( wxEVT_GRID_CELL_CHANGE, m_currentCellCoords.GetRow(), - m_currentCellCoords.GetCol() ); + m_currentCellCoords.GetCol() ) < 0 ) { + + // Event has been vetoed, set the data back. + SetCellValue(row,col,oldval); + } } } } @@ -6664,6 +6956,7 @@ bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) // void wxGrid::MakeCellVisible( int row, int col ) { + int i; int xpos = -1, ypos = -1; @@ -6704,7 +6997,10 @@ void wxGrid::MakeCellVisible( int row, int col ) // we divide it later by GRID_SCROLL_LINE, make sure that we don't // have rounding errors (this is important, because if we do, we // might not scroll at all and some cells won't be redrawn) - ypos += GRID_SCROLL_LINE / 2; + // + // Sometimes GRID_SCROLL_LINE/2 is not enough, so just add a full + // scroll unit... + ypos += GRID_SCROLL_LINE_Y; } if ( left < 0 ) @@ -6726,13 +7022,15 @@ void wxGrid::MakeCellVisible( int row, int col ) } // see comment for ypos above - xpos += GRID_SCROLL_LINE / 2; + xpos += GRID_SCROLL_LINE_X; } if ( xpos != -1 || ypos != -1 ) { - if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE; - if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE; + if ( xpos != -1 ) + xpos /= GRID_SCROLL_LINE_X; + if ( ypos != -1 ) + ypos /= GRID_SCROLL_LINE_Y; Scroll( xpos, ypos ); AdjustScrollbars(); } @@ -7338,14 +7636,14 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert ) case wxRIGHT: horiz = wxALIGN_RIGHT; break; case wxCENTRE: horiz = wxALIGN_CENTRE; break; } - + switch ( vert ) { case wxTOP: vert = wxALIGN_TOP; break; case wxBOTTOM: vert = wxALIGN_BOTTOM; break; case wxCENTRE: vert = wxALIGN_CENTRE; break; } - + if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT ) { m_rowLabelHorizAlign = horiz; @@ -7371,14 +7669,14 @@ void wxGrid::SetColLabelAlignment( int horiz, int vert ) case wxRIGHT: horiz = wxALIGN_RIGHT; break; case wxCENTRE: horiz = wxALIGN_CENTRE; break; } - + switch ( vert ) { case wxTOP: vert = wxALIGN_TOP; break; case wxBOTTOM: vert = wxALIGN_BOTTOM; break; case wxCENTRE: vert = wxALIGN_CENTRE; break; } - + if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT ) { m_colLabelHorizAlign = horiz; @@ -7460,6 +7758,38 @@ void wxGrid::SetCellHighlightColour( const wxColour& colour ) } } +void wxGrid::SetCellHighlightPenWidth(int width) +{ + if (m_cellHighlightPenWidth != width) { + m_cellHighlightPenWidth = width; + + // Just redrawing the cell highlight is not enough since that won't + // make any visible change if the the thickness is getting smaller. + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + return; + wxRect rect = CellToRect(row, col); + m_gridWin->Refresh(TRUE, &rect); + } +} + +void wxGrid::SetCellHighlightROPenWidth(int width) +{ + if (m_cellHighlightROPenWidth != width) { + m_cellHighlightROPenWidth = width; + + // Just redrawing the cell highlight is not enough since that won't + // make any visible change if the the thickness is getting smaller. + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + return; + wxRect rect = CellToRect(row, col); + m_gridWin->Refresh(TRUE, &rect); + } +} + void wxGrid::EnableGridLines( bool enable ) { if ( enable != m_gridLinesEnabled ) @@ -7663,6 +7993,7 @@ void wxGrid::ClearAttrCache() if ( m_attrCache.row != -1 ) { wxSafeDecRef(m_attrCache.attr); + m_attrCache.attr = NULL; m_attrCache.row = -1; } } @@ -7705,7 +8036,7 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const wxGridCellAttr *attr; if ( !LookupAttr(row, col, &attr) ) { - attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL; + attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any) : (wxGridCellAttr *)NULL; CacheAttr(row, col, attr); } if (attr) @@ -7723,26 +8054,21 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const { - wxGridCellAttr *attr; - if ( !LookupAttr(row, col, &attr) || !attr ) - { - wxASSERT_MSG( m_table, - _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") ); - - attr = m_table->GetAttr(row, col); - if ( !attr ) - { - attr = new wxGridCellAttr; + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; - // artificially inc the ref count to match DecRef() in caller - attr->IncRef(); + wxCHECK_MSG( m_table, attr, + _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") ); - m_table->SetAttr(attr, row, col); - } + attr = m_table->GetAttr(row, col, wxGridCellAttr::Cell); + if ( !attr ) + { + attr = new wxGridCellAttr(m_defaultCellAttr); - CacheAttr(row, col, attr); + // artificially inc the ref count to match DecRef() in caller + attr->IncRef(); + m_table->SetAttr(attr, row, col); } - attr->SetDefAttr(m_defaultCellAttr); + return attr; } @@ -7773,11 +8099,16 @@ void wxGrid::SetColFormatFloat(int col, int width, int precision) void wxGrid::SetColFormatCustom(int col, const wxString& typeName) { - wxGridCellAttr *attr = new wxGridCellAttr; + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + + attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col ); + if(!attr) + attr = new wxGridCellAttr; wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName); attr->SetRenderer(renderer); SetColAttr(col, attr); + } // ---------------------------------------------------------------------------- @@ -7789,6 +8120,7 @@ void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) if ( CanHaveAttributes() ) { m_table->SetRowAttr(attr, row); + ClearAttrCache(); } else { @@ -7801,6 +8133,7 @@ void wxGrid::SetColAttr(int col, wxGridCellAttr *attr) if ( CanHaveAttributes() ) { m_table->SetColAttr(attr, col); + ClearAttrCache(); } else { @@ -7959,8 +8292,8 @@ void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) if ( resizeExistingRows ) { InitRowHeights(); - - CalcDimensions(); + if ( !GetBatchCount() ) + CalcDimensions(); } } @@ -7983,7 +8316,8 @@ void wxGrid::SetRowSize( int row, int height ) { m_rowBottoms[i] += diff; } - CalcDimensions(); + if ( !GetBatchCount() ) + CalcDimensions(); } void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) @@ -7993,8 +8327,8 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) if ( resizeExistingCols ) { InitColWidths(); - - CalcDimensions(); + if ( !GetBatchCount() ) + CalcDimensions(); } } @@ -8019,7 +8353,8 @@ void wxGrid::SetColSize( int col, int width ) { m_colRights[i] += diff; } - CalcDimensions(); + if ( !GetBatchCount() ) + CalcDimensions(); } @@ -8094,7 +8429,7 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) if ( column ) dc.GetTextExtent( GetColLabelValue(col), &w, &h ); else - dc.GetTextExtent( GetRowLabelValue(col), &w, &h ); + dc.GetTextExtent( GetRowLabelValue(row), &w, &h ); extent = column ? w : h; if ( extent > extentMax ) @@ -8122,10 +8457,35 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) } if ( column ) + { SetColSize(col, extentMax); + if ( !GetBatchCount() ) + { + int cw, ch, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + wxRect rect ( CellToRect( 0, col ) ); + rect.y = 0; + CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); + rect.width = cw - rect.x; + rect.height = m_colLabelHeight; + m_colLabelWin->Refresh( TRUE, &rect ); + } + } else + { SetRowSize(row, extentMax); - + if ( !GetBatchCount() ) + { + int cw, ch, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + wxRect rect ( CellToRect( row, 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 ); + } + } if ( setAsMin ) { if ( column ) @@ -8139,6 +8499,9 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) { int width = m_rowLabelWidth; + if ( !calcOnly ) + BeginBatch(); + for ( int col = 0; col < m_numCols; col++ ) { if ( !calcOnly ) @@ -8149,6 +8512,9 @@ int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) width += GetColWidth(col); } + if ( !calcOnly ) + EndBatch(); + return width; } @@ -8156,6 +8522,9 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) { int height = m_colLabelHeight; + if ( !calcOnly ) + BeginBatch(); + for ( int row = 0; row < m_numRows; row++ ) { if ( !calcOnly ) @@ -8166,13 +8535,77 @@ int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) height += GetRowHeight(row); } + if ( !calcOnly ) + EndBatch(); + return height; } void wxGrid::AutoSize() { - // set the size too - SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE)); + BeginBatch(); + + wxSize size(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE)); + + // round up the size to a multiple of scroll step - this ensures that we + // won't get the scrollbars if we're sized exactly to this width + wxSize sizeFit(GetScrollX(size.x) * GRID_SCROLL_LINE_X, + GetScrollY(size.y) * GRID_SCROLL_LINE_Y); + + // distribute the extra space between teh columns/rows to avoid having + // extra white space + wxCoord diff = sizeFit.x - size.x; + if ( diff ) + { + // try to resize the columns uniformly + wxCoord diffPerCol = diff / m_numCols; + if ( diffPerCol ) + { + for ( int col = 0; col < m_numCols; col++ ) + { + SetColSize(col, GetColWidth(col) + diffPerCol); + } + } + + // add remaining amount to the last columns + diff -= diffPerCol * m_numCols; + if ( diff ) + { + for ( int col = m_numCols - 1; col >= m_numCols - diff; col-- ) + { + SetColSize(col, GetColWidth(col) + 1); + } + } + } + + // same for rows + diff = sizeFit.y - size.y; + if ( diff ) + { + // try to resize the columns uniformly + wxCoord diffPerRow = diff / m_numRows; + if ( diffPerRow ) + { + for ( int row = 0; row < m_numRows; row++ ) + { + SetRowSize(row, GetRowHeight(row) + diffPerRow); + } + } + + // add remaining amount to the last rows + diff -= diffPerRow * m_numRows; + if ( diff ) + { + for ( int row = m_numRows - 1; row >= m_numRows - diff; row-- ) + { + SetRowSize(row, GetRowHeight(row) + 1); + } + } + } + + EndBatch(); + + SetClientSize(sizeFit); } wxSize wxGrid::DoGetBestSize() const @@ -8247,20 +8680,67 @@ void wxGrid::SelectCol( int col, bool addToSelected ) } -void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, +void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, bool addToSelected ) { if ( IsSelection() && !addToSelected ) ClearSelection(); - m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol, - FALSE, addToSelected ); + m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol, + FALSE, addToSelected ); } void wxGrid::SelectAll() { - m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); + if ( m_numRows > 0 && m_numCols > 0 ) + m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); +} + +// +// ------ Cell, row and col deselection +// + +void wxGrid::DeselectRow( int row ) +{ + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) + { + if ( m_selection->IsInSelection(row, 0 ) ) + m_selection->ToggleCellSelection( row, 0); + } + else + { + int nCols = GetNumberCols(); + for ( int i = 0; i < nCols ; i++ ) + { + if ( m_selection->IsInSelection(row, i ) ) + m_selection->ToggleCellSelection( row, i); + } + } +} + +void wxGrid::DeselectCol( int col ) +{ + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) + { + if ( m_selection->IsInSelection(0, col ) ) + m_selection->ToggleCellSelection( 0, col); + } + else + { + int nRows = GetNumberRows(); + for ( int i = 0; i < nRows ; i++ ) + { + if ( m_selection->IsInSelection(i, col ) ) + m_selection->ToggleCellSelection(i, col); + } + } +} + +void wxGrid::DeselectCell( int row, int col ) +{ + if ( m_selection->IsInSelection(row, col) ) + m_selection->ToggleCellSelection(row, col); } bool wxGrid::IsSelection() @@ -8342,7 +8822,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, // ------ Grid event classes // -IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent ) +IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent ) wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj, int row, int col, int x, int y, bool sel, @@ -8363,7 +8843,7 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj, } -IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxEvent ) +IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxNotifyEvent ) wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj, int rowOrCol, int x, int y, @@ -8382,7 +8862,7 @@ wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj, } -IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent ) +IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxNotifyEvent ) wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj, const wxGridCellCoords& topLeft, @@ -8403,4 +8883,21 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec } -#endif // ifndef wxUSE_NEW_GRID +IMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent) + +wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type, + wxObject* obj, int row, + int col, wxControl* ctrl) + : wxCommandEvent(type, id) +{ + SetEventObject(obj); + m_row = row; + m_col = col; + m_ctrl = ctrl; +} + + +#endif // !wxUSE_NEW_GRID/wxUSE_NEW_GRID + +#endif // wxUSE_GRID +