X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb2957900c9c38ffa03b4ab2ea6cbcc1e23ecc7d..96997d6511c6bd055e5465e147a6b568ae445702:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 1c7a6320f0..2a92e9b748 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// Name: grid.cpp +// Name: generic/grid.cpp // Purpose: wxGrid and related classes // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn) // Modified by: @@ -21,7 +21,7 @@ #pragma implementation "grid.h" #endif -// For compilers that support precompilation, includes "wx/wx.h". +// For compilers that support precompilatixon, includes "wx/wx.h". #include "wx/wxprec.h" #include "wx/defs.h" @@ -39,19 +39,39 @@ #include "wx/dcclient.h" #include "wx/settings.h" #include "wx/log.h" + #include "wx/textctrl.h" + #include "wx/checkbox.h" + #include "wx/combobox.h" + #include "wx/valtext.h" #endif -// this include needs to be outside precomp for BCC #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 // ---------------------------------------------------------------------------- -WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs); +WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs); struct wxGridCellWithAttr { @@ -69,7 +89,7 @@ struct wxGridCellWithAttr wxGridCellAttr *attr; }; -WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); +WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); #include "wx/arrimpl.cpp" @@ -93,6 +113,7 @@ private: void OnPaint( wxPaintEvent& event ); void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); + void OnKeyUp( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow) DECLARE_EVENT_TABLE() @@ -112,6 +133,7 @@ private: void OnPaint( wxPaintEvent &event ); void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); + void OnKeyUp( wxKeyEvent& ); DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow) DECLARE_EVENT_TABLE() @@ -130,6 +152,7 @@ private: void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); + void OnKeyUp( wxKeyEvent& ); void OnPaint( wxPaintEvent& event ); DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow) @@ -162,6 +185,7 @@ private: void OnPaint( wxPaintEvent &event ); void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& ); + void OnKeyUp( wxKeyEvent& ); void OnEraseBackground( wxEraseEvent& ); @@ -182,6 +206,7 @@ public: { } void OnKeyDown(wxKeyEvent& event); + void OnChar(wxKeyEvent& event); private: wxGrid* m_grid; @@ -194,6 +219,7 @@ private: IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler ) BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler ) EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown ) + EVT_CHAR( wxGridCellEditorEvtHandler::OnChar ) END_EVENT_TABLE() @@ -208,6 +234,8 @@ class WXDLLEXPORT wxGridCellAttrData public: void SetAttr(wxGridCellAttr *attr, int row, int col); wxGridCellAttr *GetAttr(int row, int col) const; + void UpdateAttrRows( size_t pos, int numRows ); + void UpdateAttrCols( size_t pos, int numCols ); private: // searches for the attr for given cell, returns wxNOT_FOUND if not found @@ -220,10 +248,13 @@ private: class WXDLLEXPORT wxGridRowOrColAttrData { public: + // empty ctor to suppress warnings + wxGridRowOrColAttrData() { } ~wxGridRowOrColAttrData(); void SetAttr(wxGridCellAttr *attr, int rowOrCol); wxGridCellAttr *GetAttr(int rowOrCol) const; + void UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols ); private: wxArrayInt m_rowsOrCols; @@ -240,6 +271,63 @@ public: m_colAttrs; }; + +// ---------------------------------------------------------------------------- +// data structures used for the data type registry +// ---------------------------------------------------------------------------- + +struct wxGridDataTypeInfo +{ + wxGridDataTypeInfo(const wxString& typeName, + wxGridCellRenderer* renderer, + wxGridCellEditor* editor) + : m_typeName(typeName), m_renderer(renderer), m_editor(editor) + { } + + ~wxGridDataTypeInfo() + { + wxSafeDecRef(m_renderer); + wxSafeDecRef(m_editor); + } + + wxString m_typeName; + wxGridCellRenderer* m_renderer; + wxGridCellEditor* m_editor; +}; + + +WX_DEFINE_EXPORTED_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); + +private: + wxGridDataTypeInfoArray m_typeinfo; +}; + // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -258,6 +346,10 @@ public: static size_t gs_nAttrCacheMisses = 0; #endif // DEBUG_ATTR_CACHE +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + wxGridCellCoords wxGridNoCellCoords( -1, -1 ); wxRect wxGridNoCellRect( -1, -1, -1, -1 ); @@ -265,11 +357,14 @@ wxRect wxGridNoCellRect( -1, -1, -1, -1 ); // TODO: fixed so far - make configurable later (and also different for x/y) static const size_t GRID_SCROLL_LINE = 10; +// 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; + // ============================================================================ // implementation // ============================================================================ - // ---------------------------------------------------------------------------- // wxGridCellEditor // ---------------------------------------------------------------------------- @@ -285,27 +380,90 @@ wxGridCellEditor::~wxGridCellEditor() Destroy(); } +void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent), + wxWindowID WXUNUSED(id), + wxEvtHandler* evtHandler) +{ + if ( evtHandler ) + m_control->PushEventHandler(evtHandler); +} + +void wxGridCellEditor::PaintBackground(const wxRect& rectCell, + wxGridCellAttr *attr) +{ + // erase the background because we might not fill the cell + wxClientDC dc(m_control->GetParent()); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); + dc.DrawRectangle(rectCell); + + // redraw the control we just painted over + m_control->Refresh(); +} void wxGridCellEditor::Destroy() { - if (m_control) { + if (m_control) + { + m_control->PopEventHandler(TRUE /* delete it*/); + m_control->Destroy(); m_control = NULL; } } -void wxGridCellEditor::Show(bool show) +void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) { wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); m_control->Show(show); + + if ( show ) + { + // set the colours/fonts if we have any + if ( attr ) + { + m_colFgOld = m_control->GetForegroundColour(); + m_control->SetForegroundColour(attr->GetTextColour()); + + m_colBgOld = m_control->GetBackgroundColour(); + m_control->SetBackgroundColour(attr->GetBackgroundColour()); + + m_fontOld = m_control->GetFont(); + m_control->SetFont(attr->GetFont()); + + // can't do anything more in the base class version, the other + // attributes may only be used by the derived classes + } + } + else + { + // restore the standard colours fonts + if ( m_colFgOld.Ok() ) + { + m_control->SetForegroundColour(m_colFgOld); + m_colFgOld = wxNullColour; + } + + if ( m_colBgOld.Ok() ) + { + m_control->SetBackgroundColour(m_colBgOld); + m_colBgOld = wxNullColour; + } + + if ( m_fontOld.Ok() ) + { + m_control->SetFont(m_fontOld); + m_fontOld = wxNullFont; + } + } } void wxGridCellEditor::SetSize(const wxRect& rect) { wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); - m_control->SetSize(rect); + m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); } void wxGridCellEditor::HandleReturn(wxKeyEvent& event) @@ -313,65 +471,129 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event) event.Skip(); } +bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) +{ + // accept the simple key presses, not anything with Ctrl/Alt/Meta + return !(event.ControlDown() || event.AltDown()); +} void wxGridCellEditor::StartingKey(wxKeyEvent& event) { + event.Skip(); } +void wxGridCellEditor::StartingClick() +{ +} +// ---------------------------------------------------------------------------- +// wxGridCellTextEditor +// ---------------------------------------------------------------------------- wxGridCellTextEditor::wxGridCellTextEditor() { + m_maxChars = 0; } void wxGridCellTextEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { - m_control = new wxTextCtrl(parent, -1, "", + m_control = new wxTextCtrl(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize #if defined(__WXMSW__) - , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ??? + , wxTE_PROCESS_TAB | wxTE_MULTILINE | + wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL #endif - ); + ); - if (evtHandler) - m_control->PushEventHandler(evtHandler); + // TODO: use m_maxChars + + wxGridCellEditor::Create(parent, id, evtHandler); +} + +void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell), + wxGridCellAttr * WXUNUSED(attr)) +{ + // as we fill the entire client area, don't do anything here to minimize + // flicker } +void wxGridCellTextEditor::SetSize(const wxRect& rectOrig) +{ + wxRect rect(rectOrig); + + // Make the edit control large enough to allow for internal + // margins + // + // TODO: remove this if the text ctrl sizing is improved esp. for + // unix + // +#if defined(__WXGTK__) + if (rect.x != 0) + { + rect.x += 1; + rect.y += 1; + rect.width -= 1; + rect.height -= 1; + } +#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. +#if defined(__WXMSW__) + int extra_y = 2; +#else + int extra_y = ( rect.y > 2 )? 2 : 1; +#endif // MSW + +#if defined(__WXMOTIF__) + extra_x *= 2; + extra_y *= 2; +#endif + rect.SetLeft( wxMax(0, rect.x - extra_x) ); + rect.SetTop( wxMax(0, rect.y - extra_y) ); + rect.SetRight( rect.GetRight() + 2*extra_x ); + rect.SetBottom( rect.GetBottom() + 2*extra_y ); +#endif // GTK/!GTK + + wxGridCellEditor::SetSize(rect); +} -void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid, - wxGridCellAttr* attr) +void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid) { wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); m_startValue = grid->GetTable()->GetValue(row, col); - ((wxTextCtrl*)m_control)->SetValue(m_startValue); - ((wxTextCtrl*)m_control)->SetInsertionPointEnd(); - ((wxTextCtrl*)m_control)->SetFocus(); - // ??? Should we use attr and try to set colours and font? + DoBeginEdit(m_startValue); } +void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue) +{ + Text()->SetValue(startValue); + Text()->SetInsertionPointEnd(); + Text()->SetFocus(); +} - -bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue, - wxGrid* grid, wxGridCellAttr* attr) +bool wxGridCellTextEditor::EndEdit(int row, int col, + wxGrid* grid) { wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); bool changed = FALSE; - wxString value = ((wxTextCtrl*)m_control)->GetValue(); + wxString value = Text()->GetValue(); if (value != m_startValue) changed = TRUE; if (changed) grid->GetTable()->SetValue(row, col, value); - m_startValue = ""; - ((wxTextCtrl*)m_control)->SetValue(m_startValue); + m_startValue = wxEmptyString; + Text()->SetValue(m_startValue); return changed; } @@ -382,35 +604,138 @@ void wxGridCellTextEditor::Reset() wxASSERT_MSG(m_control, wxT("The wxGridCellEditor must be Created first!")); - ((wxTextCtrl*)m_control)->SetValue(m_startValue); - ((wxTextCtrl*)m_control)->SetInsertionPointEnd(); + DoReset(m_startValue); } +void wxGridCellTextEditor::DoReset(const wxString& startValue) +{ + Text()->SetValue(startValue); + Text()->SetInsertionPointEnd(); +} -void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) +bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event) { - wxASSERT_MSG(m_control, - wxT("The wxGridCellEditor must be Created first!")); + if ( wxGridCellEditor::IsAcceptedKey(event) ) + { + 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: + case WXK_MULTIPLY: + case WXK_NUMPAD_MULTIPLY: + case WXK_ADD: + case WXK_NUMPAD_ADD: + case WXK_SUBTRACT: + case WXK_NUMPAD_SUBTRACT: + case WXK_DECIMAL: + case WXK_NUMPAD_DECIMAL: + case WXK_DIVIDE: + case WXK_NUMPAD_DIVIDE: + return TRUE; - int code = event.KeyCode(); - if (code >= 32 && code < 255) { - wxString st((char)code); - if (! event.ShiftDown()) - st.LowerCase(); - ((wxTextCtrl*)m_control)->AppendText(st); + default: + // accept 8 bit chars too if isprint() agrees + if ( (keycode < 255) && (isprint(keycode)) ) + return TRUE; + } } + + return FALSE; } +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 + { + 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 = ((wxTextCtrl*)m_control)->GetInsertionPoint(); - wxString s( ((wxTextCtrl*)m_control)->GetValue() ); + size_t pos = (size_t)( Text()->GetInsertionPoint() ); + wxString s( Text()->GetValue() ); s = s.Left(pos) + "\n" + s.Mid(pos); - ((wxTextCtrl*)m_control)->SetValue(s); - ((wxTextCtrl*)m_control)->SetInsertionPoint( pos ); + Text()->SetValue(s); + Text()->SetInsertionPoint( pos ); #else // the other ports can handle a Return key press // @@ -418,132 +743,1153 @@ void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event) #endif } - -void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) +void wxGridCellTextEditor::SetParameters(const wxString& params) { - switch ( event.KeyCode() ) + if ( !params ) { - case WXK_ESCAPE: - m_editor->Reset(); - m_grid->EnableCellEditControl(FALSE); - break; - -// case WXK_UP: -// case WXK_DOWN: -// case WXK_LEFT: -// case WXK_RIGHT: -// case WXK_PRIOR: -// case WXK_NEXT: -// case WXK_SPACE: -// case WXK_HOME: -// case WXK_END: -// // send the event to the parent grid, skipping the -// // event if nothing happens -// // -// event.Skip( m_grid->ProcessEvent( event ) ); -// break; - - case WXK_TAB: - case WXK_RETURN: - if (!m_grid->ProcessEvent(event)) - m_editor->HandleReturn(event); - break; - - - default: - event.Skip(); + // 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; + } } } // ---------------------------------------------------------------------------- -// wxGridCellRenderer +// wxGridCellNumberEditor // ---------------------------------------------------------------------------- -void wxGridCellRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) +wxGridCellNumberEditor::wxGridCellNumberEditor(int min, int max) { - dc.SetBackgroundMode( wxSOLID ); + m_min = min; + m_max = max; +} - if ( isSelected ) +void wxGridCellNumberEditor::Create(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler) +{ + if ( HasRange() ) { - dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); + // create a spin ctrl + m_control = new wxSpinCtrl(parent, -1, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxSP_ARROW_KEYS, + m_min, m_max); + + wxGridCellEditor::Create(parent, id, evtHandler); } else { - dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); - } + // just a text control + wxGridCellTextEditor::Create(parent, id, evtHandler); - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle(rect); +#if wxUSE_VALIDATORS + Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); +#endif // wxUSE_VALIDATORS + } } -void wxGridCellStringRenderer::Draw(wxGrid& grid, - wxGridCellAttr& attr, - wxDC& dc, - const wxRect& rectCell, - int row, int col, - bool isSelected) +void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid) { - wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); - - // now we only have to draw the text - dc.SetBackgroundMode( wxTRANSPARENT ); + // first get the value + wxGridTableBase *table = grid->GetTable(); + if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) ) + { + m_valueOld = table->GetValueAsLong(row, col); + } + else + { + wxString sValue = table->GetValue(row, col); + if (! sValue.ToLong(&m_valueOld)) + { + wxFAIL_MSG( _T("this cell doesn't have numeric value") ); + return; + } + } - if ( isSelected ) + if ( HasRange() ) { - dc.SetTextBackground( grid.GetSelectionBackground() ); - dc.SetTextForeground( grid.GetSelectionForeground() ); + Spin()->SetValue((int)m_valueOld); + Spin()->SetFocus(); } else { - dc.SetTextBackground( attr.GetBackgroundColour() ); - dc.SetTextForeground( attr.GetTextColour() ); + DoBeginEdit(GetString()); } - dc.SetFont( attr.GetFont() ); +} - int hAlign, vAlign; - attr.GetAlignment(&hAlign, &vAlign); +bool wxGridCellNumberEditor::EndEdit(int row, int col, + wxGrid* grid) +{ + bool changed; + long value; - wxRect rect = rectCell; - rect.x++; - rect.y++; - rect.width -= 2; - rect.height -= 2; + if ( HasRange() ) + { + value = Spin()->GetValue(); + changed = value != m_valueOld; + } + else + { + changed = Text()->GetValue().ToLong(&value) && (value != m_valueOld); + } - grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), - rect, hAlign, vAlign); -} + if ( changed ) + { + if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER)) + grid->GetTable()->SetValueAsLong(row, col, value); + else + grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%ld"), value)); + } -// ---------------------------------------------------------------------------- -// wxGridCellAttr -// ---------------------------------------------------------------------------- + return changed; +} -const wxColour& wxGridCellAttr::GetTextColour() const +void wxGridCellNumberEditor::Reset() { - if (HasTextColour()) - return m_colText; - else if (m_defGridAttr != this) - return m_defGridAttr->GetTextColour(); - else { - wxFAIL_MSG(wxT("Missing default cell attribute")); - return wxNullColour; + if ( HasRange() ) + { + Spin()->SetValue((int)m_valueOld); + } + else + { + DoReset(GetString()); } } - -const wxColour& wxGridCellAttr::GetBackgroundColour() const +bool wxGridCellNumberEditor::IsAcceptedKey(wxKeyEvent& event) { - if (HasBackgroundColour()) - return m_colBack; - else if (m_defGridAttr != this) - return m_defGridAttr->GetBackgroundColour(); - else { - wxFAIL_MSG(wxT("Missing default cell attribute")); - return wxNullColour; + if ( wxGridCellEditor::IsAcceptedKey(event) ) + { + 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: + case WXK_ADD: + case WXK_NUMPAD_ADD: + case WXK_SUBTRACT: + case WXK_NUMPAD_SUBTRACT: + case WXK_UP: + case WXK_DOWN: + return TRUE; + + default: + if ( (keycode < 128) && isdigit(keycode) ) + return TRUE; + } + } + + return FALSE; +} + +void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event) +{ + if ( !HasRange() ) + { + int keycode = (int) event.KeyCode(); + if ( isdigit(keycode) || keycode == '+' || keycode == '-' ) + { + wxGridCellTextEditor::StartingKey(event); + + // skip Skip() below + return; + } + } + + 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 +// ---------------------------------------------------------------------------- + +wxGridCellFloatEditor::wxGridCellFloatEditor(int width, int precision) +{ + m_width = width; + m_precision = precision; +} + +void wxGridCellFloatEditor::Create(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler) +{ + wxGridCellTextEditor::Create(parent, id, evtHandler); + +#if wxUSE_VALIDATORS + Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); +#endif // wxUSE_VALIDATORS +} + +void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid) +{ + // first get the value + wxGridTableBase *table = grid->GetTable(); + if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) ) + { + m_valueOld = table->GetValueAsDouble(row, col); + } + else + { + wxString sValue = table->GetValue(row, col); + if (! sValue.ToDouble(&m_valueOld)) + { + wxFAIL_MSG( _T("this cell doesn't have float value") ); + return; + } + } + + DoBeginEdit(GetString()); +} + +bool wxGridCellFloatEditor::EndEdit(int row, int col, + wxGrid* grid) +{ + double value; + if ( Text()->GetValue().ToDouble(&value) && (value != m_valueOld) ) + { + if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_FLOAT)) + grid->GetTable()->SetValueAsDouble(row, col, value); + else + grid->GetTable()->SetValue(row, col, wxString::Format(wxT("%f"), value)); + + return TRUE; + } + else + { + return FALSE; + } +} + +void wxGridCellFloatEditor::Reset() +{ + DoReset(GetString()); +} + +void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event) +{ + int keycode = (int)event.KeyCode(); + if ( isdigit(keycode) || + keycode == '+' || keycode == '-' || keycode == '.' ) + { + wxGridCellTextEditor::StartingKey(event); + + // skip Skip() below + return; + } + + event.Skip(); +} + +void wxGridCellFloatEditor::SetParameters(const wxString& params) +{ + if ( !params ) + { + // reset to default + m_width = + m_precision = -1; + } + else + { + long tmp; + if ( params.BeforeFirst(_T(',')).ToLong(&tmp) ) + { + m_width = (int)tmp; + + if ( params.AfterFirst(_T(',')).ToLong(&tmp) ) + { + m_precision = (int)tmp; + + // skip the error message below + return; + } + } + + wxLogDebug(_T("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str()); + } +} + +wxString wxGridCellFloatEditor::GetString() const +{ + wxString fmt; + if ( m_width == -1 ) + { + // default width/precision + fmt = _T("%g"); + } + else if ( m_precision == -1 ) + { + // default precision + fmt.Printf(_T("%%%d.g"), m_width); + } + else + { + fmt.Printf(_T("%%%d.%dg"), m_width, m_precision); + } + + return wxString::Format(fmt, m_valueOld); +} + +bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event) +{ + if ( wxGridCellEditor::IsAcceptedKey(event) ) + { + 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: + case WXK_ADD: + case WXK_NUMPAD_ADD: + case WXK_SUBTRACT: + case WXK_NUMPAD_SUBTRACT: + case WXK_DECIMAL: + case WXK_NUMPAD_DECIMAL: + return TRUE; + + default: + // additionally accept 'e' as in '1e+6' + if ( (keycode < 128) && + (isdigit(keycode) || tolower(keycode) == 'e') ) + return TRUE; + } + } + + return FALSE; +} + +// ---------------------------------------------------------------------------- +// wxGridCellBoolEditor +// ---------------------------------------------------------------------------- + +void wxGridCellBoolEditor::Create(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler) +{ + m_control = new wxCheckBox(parent, id, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxNO_BORDER); + + wxGridCellEditor::Create(parent, id, evtHandler); +} + +void wxGridCellBoolEditor::SetSize(const wxRect& r) +{ + bool resize = FALSE; + wxSize size = m_control->GetSize(); + wxCoord minSize = wxMin(r.width, r.height); + + // check if the checkbox is not too big/small for this cell + wxSize sizeBest = m_control->GetBestSize(); + if ( !(size == sizeBest) ) + { + // reset to default size if it had been made smaller + size = sizeBest; + + resize = TRUE; + } + + if ( size.x >= minSize || size.y >= minSize ) + { + // leave 1 pixel margin + size.x = size.y = minSize - 2; + + resize = TRUE; + } + + if ( resize ) + { + m_control->SetSize(size); + } + + // position it in the centre of the rectangle (TODO: support alignment?) + +#if defined(__WXGTK__) || defined (__WXMOTIF__) + // the checkbox without label still has some space to the right in wxGTK, + // so shift it to the right + size.x -= 8; +#elif defined(__WXMSW__) + // here too, but in other way + size.x += 1; + size.y -= 2; +#endif + + m_control->Move(r.x + r.width/2 - size.x/2, r.y + r.height/2 - size.y/2); +} + +void wxGridCellBoolEditor::Show(bool show, wxGridCellAttr *attr) +{ + m_control->Show(show); + + if ( show ) + { + wxColour colBg = attr ? attr->GetBackgroundColour() : *wxLIGHT_GREY; + CBox()->SetBackgroundColour(colBg); + } +} + +void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) + m_startValue = grid->GetTable()->GetValueAsBool(row, col); + else + { + wxString cellval( grid->GetTable()->GetValue(row, col) ); + m_startValue = !( !cellval || (cellval == "0") ); + } + CBox()->SetValue(m_startValue); + CBox()->SetFocus(); +} + +bool wxGridCellBoolEditor::EndEdit(int row, int col, + wxGrid* grid) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + bool changed = FALSE; + bool value = CBox()->GetValue(); + if ( value != m_startValue ) + changed = TRUE; + + if ( changed ) + { + if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL)) + grid->GetTable()->SetValueAsBool(row, col, value); + else + grid->GetTable()->SetValue(row, col, value ? _T("1") : wxEmptyString); + } + + return changed; +} + +void wxGridCellBoolEditor::Reset() +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + CBox()->SetValue(m_startValue); +} + +void wxGridCellBoolEditor::StartingClick() +{ + CBox()->SetValue(!CBox()->GetValue()); +} + +bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event) +{ + if ( wxGridCellEditor::IsAcceptedKey(event) ) + { + int keycode = event.GetKeyCode(); + switch ( keycode ) + { + case WXK_MULTIPLY: + case WXK_NUMPAD_MULTIPLY: + case WXK_ADD: + case WXK_NUMPAD_ADD: + case WXK_SUBTRACT: + case WXK_NUMPAD_SUBTRACT: + case WXK_SPACE: + case '+': + case '-': + return TRUE; + } + } + + return FALSE; +} + +// ---------------------------------------------------------------------------- +// wxGridCellChoiceEditor +// ---------------------------------------------------------------------------- + +wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count, + const wxString choices[], + bool allowOthers) + : m_allowOthers(allowOthers) +{ + if ( count ) + { + 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) +{ + size_t count = m_choices.GetCount(); + wxString *choices = new wxString[count]; + for ( size_t n = 0; n < count; n++ ) + { + choices[n] = m_choices[n]; + } + + m_control = new wxComboBox(parent, id, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + count, choices, + m_allowOthers ? 0 : wxCB_READONLY); + + delete [] choices; + + wxGridCellEditor::Create(parent, id, evtHandler); +} + +void wxGridCellChoiceEditor::PaintBackground(const wxRect& rectCell, + wxGridCellAttr * attr) +{ + // as we fill the entire client area, don't do anything here to minimize + // flicker + + // TODO: It doesn't actually fill the client area since the height of a + // combo always defaults to the standard... Until someone has time to + // figure out the right rectangle to paint, just do it the normal way... + wxGridCellEditor::PaintBackground(rectCell, attr); +} + +void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + m_startValue = grid->GetTable()->GetValue(row, col); + + Combo()->SetValue(m_startValue); + size_t count = m_choices.GetCount(); + for (size_t i=0; iSetSelection(i); + break; + } + } + Combo()->SetInsertionPointEnd(); + Combo()->SetFocus(); +} + +bool wxGridCellChoiceEditor::EndEdit(int row, int col, + wxGrid* grid) +{ + wxString value = Combo()->GetValue(); + bool changed = value != m_startValue; + + if ( changed ) + grid->GetTable()->SetValue(row, col, value); + + m_startValue = wxEmptyString; + Combo()->SetValue(m_startValue); + + return changed; +} + +void wxGridCellChoiceEditor::Reset() +{ + Combo()->SetValue(m_startValue); + 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 +// ---------------------------------------------------------------------------- + +void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event) +{ + switch ( event.KeyCode() ) + { + case WXK_ESCAPE: + m_editor->Reset(); + m_grid->DisableCellEditControl(); + break; + + case WXK_TAB: + event.Skip( m_grid->ProcessEvent( event ) ); + break; + + case WXK_NUMPAD_ENTER: + case WXK_RETURN: + if (!m_grid->ProcessEvent(event)) + m_editor->HandleReturn(event); + break; + + + default: + event.Skip(); + } +} + +void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) +{ + switch ( event.KeyCode() ) + { + case WXK_ESCAPE: + case WXK_TAB: + case WXK_RETURN: + case WXK_NUMPAD_ENTER: + break; + + default: + event.Skip(); + } +} + +// ---------------------------------------------------------------------------- +// 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 +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxGridCellRenderer +// ---------------------------------------------------------------------------- + +void wxGridCellRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rect, + int WXUNUSED(row), int WXUNUSED(col), + bool isSelected) +{ + dc.SetBackgroundMode( wxSOLID ); + + if ( isSelected ) + { + dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); + } + else + { + dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); + } + + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.DrawRectangle(rect); +} + +// ---------------------------------------------------------------------------- +// wxGridCellStringRenderer +// ---------------------------------------------------------------------------- + +void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + bool isSelected) +{ + dc.SetBackgroundMode( wxTRANSPARENT ); + + // TODO some special colours for attr.IsReadOnly() case? + + if ( isSelected ) + { + dc.SetTextBackground( grid.GetSelectionBackground() ); + dc.SetTextForeground( grid.GetSelectionForeground() ); + } + else + { + dc.SetTextBackground( attr.GetBackgroundColour() ); + dc.SetTextForeground( attr.GetTextColour() ); + } + + dc.SetFont( attr.GetFont() ); +} + +wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr, + wxDC& dc, + const wxString& text) +{ + wxCoord x = 0, y = 0, max_x = 0; + dc.SetFont(attr.GetFont()); + wxStringTokenizer tk(text, _T('\n')); + while ( tk.HasMoreTokens() ) + { + dc.GetTextExtent(tk.GetNextToken(), &x, &y); + max_x = wxMax(max_x, x); + } + + y *= 1 + text.Freq(wxT('\n')); // multiply by the number of lines. + + return wxSize(max_x, y); +} + +wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + int row, int col) +{ + return DoGetBestSize(attr, dc, grid.GetCellValue(row, col)); +} + +void wxGridCellStringRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rectCell, + int row, int col, + bool isSelected) +{ + wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); + + // now we only have to draw the text + SetTextColoursAndFont(grid, attr, dc, isSelected); + + int hAlign, vAlign; + attr.GetAlignment(&hAlign, &vAlign); + + wxRect rect = rectCell; + rect.Inflate(-1); + + grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), + rect, hAlign, vAlign); +} + +// ---------------------------------------------------------------------------- +// wxGridCellNumberRenderer +// ---------------------------------------------------------------------------- + +wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col) +{ + wxGridTableBase *table = grid.GetTable(); + wxString text; + if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) ) + { + text.Printf(_T("%ld"), table->GetValueAsLong(row, col)); + } + else + { + text = table->GetValue(row, col); + } + + return text; +} + +void wxGridCellNumberRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rectCell, + int row, int col, + bool isSelected) +{ + wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); + + SetTextColoursAndFont(grid, attr, dc, isSelected); + + // draw the text right aligned by default + int hAlign, vAlign; + attr.GetAlignment(&hAlign, &vAlign); + hAlign = wxALIGN_RIGHT; + + wxRect rect = rectCell; + rect.Inflate(-1); + + grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign); +} + +wxSize wxGridCellNumberRenderer::GetBestSize(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + int row, int col) +{ + return DoGetBestSize(attr, dc, GetString(grid, row, col)); +} + +// ---------------------------------------------------------------------------- +// wxGridCellFloatRenderer +// ---------------------------------------------------------------------------- + +wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision) +{ + SetWidth(width); + 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) ) + { + 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; +} + +void wxGridCellFloatRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rectCell, + int row, int col, + bool isSelected) +{ + wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); + + SetTextColoursAndFont(grid, attr, dc, isSelected); + + // draw the text right aligned by default + int hAlign, vAlign; + attr.GetAlignment(&hAlign, &vAlign); + hAlign = wxALIGN_RIGHT; + + wxRect rect = rectCell; + rect.Inflate(-1); + + grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign); +} + +wxSize wxGridCellFloatRenderer::GetBestSize(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + int row, int col) +{ + 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 +// ---------------------------------------------------------------------------- + +wxSize wxGridCellBoolRenderer::ms_sizeCheckMark; + +// FIXME these checkbox size calculations are really ugly... + +// between checkmark and box +static const wxCoord wxGRID_CHECKMARK_MARGIN = 2; + +wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, + wxGridCellAttr& WXUNUSED(attr), + wxDC& WXUNUSED(dc), + int WXUNUSED(row), + int WXUNUSED(col)) +{ + // compute it only once (no locks for MT safeness in GUI thread...) + if ( !ms_sizeCheckMark.x ) + { + // get checkbox size + wxCoord checkSize = 0; + wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString); + wxSize size = checkbox->GetBestSize(); + checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN; + + // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result +#if defined(__WXGTK__) || defined(__WXMOTIF__) + checkSize -= size.y / 2; +#endif + + delete checkbox; + + ms_sizeCheckMark.x = ms_sizeCheckMark.y = checkSize; + } + + return ms_sizeCheckMark; +} + +void wxGridCellBoolRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rect, + int row, int col, + bool isSelected) +{ + wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected); + + // draw a check mark in the centre (ignoring alignment - TODO) + wxSize size = GetBestSize(grid, attr, dc, row, col); + + // don't draw outside the cell + wxCoord minSize = wxMin(rect.width, rect.height); + if ( size.x >= minSize || size.y >= minSize ) + { + // and even leave (at least) 1 pixel margin + size.x = size.y = minSize - 2; + } + + // draw a border around checkmark + 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) ) + value = grid.GetTable()->GetValueAsBool(row, col); + else + { + wxString cellval( grid.GetTable()->GetValue(row, col) ); + value = !( !cellval || (cellval == "0") ); + } + + 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()) + { + return m_colText; + } + else if (m_defGridAttr != this) + { + return m_defGridAttr->GetTextColour(); + } + else + { + wxFAIL_MSG(wxT("Missing default cell attribute")); + return wxNullColour; + } +} + + +const wxColour& wxGridCellAttr::GetBackgroundColour() const +{ + if (HasBackgroundColour()) + return m_colBack; + else if (m_defGridAttr != this) + return m_defGridAttr->GetBackgroundColour(); + else + { + wxFAIL_MSG(wxT("Missing default cell attribute")); + return wxNullColour; } } @@ -554,7 +1900,8 @@ const wxFont& wxGridCellAttr::GetFont() const return m_font; else if (m_defGridAttr != this) return m_defGridAttr->GetFont(); - else { + else + { wxFAIL_MSG(wxT("Missing default cell attribute")); return wxNullFont; } @@ -563,40 +1910,83 @@ const wxFont& wxGridCellAttr::GetFont() const void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const { - if (HasAlignment()) { + if (HasAlignment()) + { if ( hAlign ) *hAlign = m_hAlign; if ( vAlign ) *vAlign = m_vAlign; } else if (m_defGridAttr != this) m_defGridAttr->GetAlignment(hAlign, vAlign); - else { + else + { wxFAIL_MSG(wxT("Missing default cell attribute")); } } -wxGridCellRenderer* wxGridCellAttr::GetRenderer() const +// GetRenderer and GetEditor use a slightly different decision path about +// which attribute to use. If a non-default attr object has one then it is +// used, otherwise the default editor or renderer is fetched from the grid and +// used. It should be the default for the data type of the cell. If it is +// NULL (because the table has a type that the grid does not have in its +// registry,) then the grid's default editor or renderer is used. + +wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const { - if (HasRenderer()) - return m_renderer; - else if (m_defGridAttr != this) - return m_defGridAttr->GetRenderer(); - else { + wxGridCellRenderer* renderer = NULL; + + 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) + { wxFAIL_MSG(wxT("Missing default cell attribute")); - return NULL; } + + return renderer; } -wxGridCellEditor* wxGridCellAttr::GetEditor() const +wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const { - if (HasEditor()) - return m_editor; - else if (m_defGridAttr != this) - return m_defGridAttr->GetEditor(); - else { + wxGridCellEditor* editor = NULL; + + 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 ) + { wxFAIL_MSG(wxT("Missing default cell attribute")); - return NULL; } + + return editor; } // ---------------------------------------------------------------------------- @@ -640,6 +2030,72 @@ wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const return attr; } +void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows ) +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxGridCellCoords& coords = m_attrs[n].coords; + wxCoord row = coords.GetRow(); + if ((size_t)row >= pos) + { + if (numRows > 0) + { + // If rows inserted, include row counter where necessary + coords.SetRow(row + numRows); + } + else if (numRows < 0) + { + // If rows deleted ... + if ((size_t)row >= pos - numRows) + { + // ...either decrement row counter (if row still exists)... + coords.SetRow(row + numRows); + } + else + { + // ...or remove the attribute + m_attrs.RemoveAt((size_t)n); + n--; count--; + } + } + } + } +} + +void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols ) +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxGridCellCoords& coords = m_attrs[n].coords; + wxCoord col = coords.GetCol(); + if ( (size_t)col >= pos ) + { + if ( numCols > 0 ) + { + // If rows inserted, include row counter where necessary + coords.SetCol(col + numCols); + } + else if (numCols < 0) + { + // If rows deleted ... + if ((size_t)col >= pos - numCols) + { + // ...either decrement row counter (if row still exists)... + coords.SetCol(col + numCols); + } + else + { + // ...or remove the attribute + m_attrs.RemoveAt((size_t)n); + n--; count--; + } + } + } + } +} + int wxGridCellAttrData::FindIndex(int row, int col) const { size_t count = m_attrs.GetCount(); @@ -684,8 +2140,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); @@ -693,17 +2149,48 @@ 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); + } + } +} + +void wxGridRowOrColAttrData::UpdateAttrRowsOrCols( size_t pos, int numRowsOrCols ) +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + int & rowOrCol = m_rowsOrCols[n]; + if ( (size_t)rowOrCol >= pos ) + { + if ( numRowsOrCols > 0 ) + { + // If rows inserted, include row counter where necessary + rowOrCol += numRowsOrCols; + } + else if ( numRowsOrCols < 0) + { + // If rows deleted, either decrement row counter (if row still exists) + if ((size_t)rowOrCol >= pos - numRowsOrCols) + rowOrCol += numRowsOrCols; + else + { + m_rowsOrCols.RemoveAt((size_t)n); + m_attrs.RemoveAt((size_t)n); + n--; count--; + } + } } } } @@ -777,14 +2264,179 @@ void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col) m_data->m_colAttrs.SetAttr(attr, col); } +void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows ) +{ + if ( m_data ) + { + m_data->m_cellAttrs.UpdateAttrRows( pos, numRows ); + + m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows ); + } +} + +void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols ) +{ + if ( m_data ) + { + m_data->m_cellAttrs.UpdateAttrCols( pos, numCols ); + + m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols ); + } +} + +// ---------------------------------------------------------------------------- +// wxGridTypeRegistry +// ---------------------------------------------------------------------------- + +wxGridTypeRegistry::~wxGridTypeRegistry() +{ + size_t count = m_typeinfo.Count(); + for ( size_t i = 0; i < count; i++ ) + delete m_typeinfo[i]; +} + + +void wxGridTypeRegistry::RegisterDataType(const wxString& typeName, + wxGridCellRenderer* renderer, + wxGridCellEditor* editor) +{ + wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor); + + // is it already registered? + int loc = FindRegisteredDataType(typeName); + if ( loc != wxNOT_FOUND ) + { + delete m_typeinfo[loc]; + m_typeinfo[loc] = info; + } + 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 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; + } + + // 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 index; +} + +wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index) +{ + wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer; + if (renderer) + renderer->IncRef(); + return renderer; +} + +wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) +{ + wxGridCellEditor* editor = m_typeinfo[index]->m_editor; + if (editor) + editor->IncRef(); + return editor; +} + // ---------------------------------------------------------------------------- // wxGridTableBase // ---------------------------------------------------------------------------- -////////////////////////////////////////////////////////////////////// -// -// Abstract base class for grid data (the model) -// IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject ) @@ -805,6 +2457,16 @@ void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider) m_attrProvider = attrProvider; } +bool wxGridTableBase::CanHaveAttributes() +{ + if ( ! GetAttrProvider() ) + { + // use the default attr provider by default + SetAttrProvider(new wxGridCellAttrProvider); + } + return TRUE; +} + wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col) { if ( m_attrProvider ) @@ -823,7 +2485,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); } } @@ -837,7 +2499,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); } } @@ -851,54 +2513,52 @@ 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); } } -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") ); + wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") ); 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")); + wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function")); 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")); + wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function")); 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")); + wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function")); 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")); + wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function")); 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")); + wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function")); return FALSE; } @@ -907,7 +2567,8 @@ bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols ) wxString wxGridTableBase::GetRowLabelValue( int row ) { wxString s; - s << row; + s << row + 1; // RD: Starting the rows at zero confuses users, no matter + // how much it makes sense to us geeks. return s; } @@ -938,6 +2599,64 @@ wxString wxGridTableBase::GetColLabelValue( int col ) } +wxString wxGridTableBase::GetTypeName( int WXUNUSED(row), int WXUNUSED(col) ) +{ + return wxGRID_VALUE_STRING; +} + +bool wxGridTableBase::CanGetValueAs( int WXUNUSED(row), int WXUNUSED(col), + const wxString& typeName ) +{ + return typeName == wxGRID_VALUE_STRING; +} + +bool wxGridTableBase::CanSetValueAs( int row, int col, const wxString& typeName ) +{ + return CanGetValueAs(row, col, typeName); +} + +long wxGridTableBase::GetValueAsLong( int WXUNUSED(row), int WXUNUSED(col) ) +{ + return 0; +} + +double wxGridTableBase::GetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col) ) +{ + return 0.0; +} + +bool wxGridTableBase::GetValueAsBool( int WXUNUSED(row), int WXUNUSED(col) ) +{ + return FALSE; +} + +void wxGridTableBase::SetValueAsLong( int WXUNUSED(row), int WXUNUSED(col), + long WXUNUSED(value) ) +{ +} + +void wxGridTableBase::SetValueAsDouble( int WXUNUSED(row), int WXUNUSED(col), + double WXUNUSED(value) ) +{ +} + +void wxGridTableBase::SetValueAsBool( int WXUNUSED(row), int WXUNUSED(col), + bool WXUNUSED(value) ) +{ +} + + +void* wxGridTableBase::GetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col), + const wxString& WXUNUSED(typeName) ) +{ + return NULL; +} + +void wxGridTableBase::SetValueAsCustom( int WXUNUSED(row), int WXUNUSED(col), + const wxString& WXUNUSED(typeName), + void* WXUNUSED(value) ) +{ +} ////////////////////////////////////////////////////////////////////// // @@ -1003,12 +2722,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(); @@ -1018,26 +2737,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& s ) +void wxGridStringTable::SetValue( int row, int col, const wxString& value ) { - // TODO: bounds checking - // - m_data[row][col] = s; + 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; @@ -1064,7 +2785,8 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) size_t row, col; size_t curNumRows = m_data.GetCount(); - size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 ); + size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : + ( GetView() ? GetView()->GetNumberCols() : 0 ) ); if ( pos >= curNumRows ) { @@ -1082,7 +2804,6 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) { m_data.Insert( sa, row ); } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -1101,7 +2822,8 @@ bool wxGridStringTable::AppendRows( size_t numRows ) size_t row, col; size_t curNumRows = m_data.GetCount(); - size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 ); + size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : + ( GetView() ? GetView()->GetNumberCols() : 0 ) ); wxArrayString sa; if ( curNumCols > 0 ) @@ -1139,10 +2861,9 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) if ( pos >= curNumRows ) { wxString errmsg; - errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n" - "Pos value is invalid for present table with %d rows", + errmsg.Printf(wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\nPos value is invalid for present table with %d rows"), pos, numRows, curNumRows ); - wxFAIL_MSG( wxT(errmsg) ); + wxFAIL_MSG( errmsg ); return FALSE; } @@ -1162,7 +2883,6 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) m_data.Remove( pos ); } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -1181,7 +2901,8 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) size_t row, col; size_t curNumRows = m_data.GetCount(); - size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 ); + size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : + ( GetView() ? GetView()->GetNumberCols() : 0 ) ); if ( pos >= curNumCols ) { @@ -1195,7 +2916,6 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) m_data[row].Insert( wxEmptyString, col ); } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -1214,14 +2934,15 @@ bool wxGridStringTable::AppendCols( size_t numCols ) size_t row, n; size_t curNumRows = m_data.GetCount(); +#if 0 if ( !curNumRows ) { // TODO: something better than this ? // - wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\n" - "Call AppendRows() first") ); + wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") ); return FALSE; } +#endif for ( row = 0; row < curNumRows; row++ ) { @@ -1248,15 +2969,15 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) size_t row, n; size_t curNumRows = m_data.GetCount(); - size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 ); + size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : + ( GetView() ? GetView()->GetNumberCols() : 0 ) ); if ( pos >= curNumCols ) { wxString errmsg; - errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n" - "Pos value is invalid for present table with %d cols", + errmsg.Printf( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\nPos value is invalid for present table with %d cols"), pos, numCols, curNumCols ); - wxFAIL_MSG( wxT( errmsg ) ); + wxFAIL_MSG( errmsg ); return FALSE; } @@ -1279,7 +3000,6 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) } } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -1362,17 +3082,18 @@ BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow ) EVT_PAINT( wxGridRowLabelWindow::OnPaint ) EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown ) + EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp ) 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); @@ -1405,6 +3126,11 @@ void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event ) if ( !m_owner->ProcessEvent( event ) ) event.Skip(); } +void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} + ////////////////////////////////////////////////////////////////////// @@ -1415,17 +3141,18 @@ BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow ) EVT_PAINT( wxGridColLabelWindow::OnPaint ) EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown ) + EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp ) 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); @@ -1458,6 +3185,11 @@ void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event ) if ( !m_owner->ProcessEvent( event ) ) event.Skip(); } +void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} + ////////////////////////////////////////////////////////////////////// @@ -1468,12 +3200,13 @@ BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow ) EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent ) EVT_PAINT( wxGridCornerLabelWindow::OnPaint) EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown ) + EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp ) 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; } @@ -1510,6 +3243,11 @@ void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event ) if ( !m_owner->ProcessEvent( event ) ) event.Skip(); } +void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} + ////////////////////////////////////////////////////////////////////// @@ -1520,6 +3258,7 @@ BEGIN_EVENT_TABLE( wxGridWindow, wxPanel ) EVT_PAINT( wxGridWindow::OnPaint ) EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridWindow::OnKeyDown ) + EVT_KEY_UP( wxGridWindow::OnKeyUp ) EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground ) END_EVENT_TABLE() @@ -1527,7 +3266,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; @@ -1551,6 +3290,8 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) #if WXGRID_DRAW_LINES m_owner->DrawAllGridLines( dc, reg ); #endif + m_owner->DrawGridSpace( dc ); + m_owner->DrawHighlight( dc ); } @@ -1568,7 +3309,7 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) } -// This seems to be required for wxMotif otherwise the mouse +// 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 ) @@ -1576,10 +3317,14 @@ void wxGridWindow::OnKeyDown( wxKeyEvent& event ) if ( !m_owner->ProcessEvent( event ) ) event.Skip(); } -void wxGridWindow::OnEraseBackground(wxEraseEvent&) -{ } - +void wxGridWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} +void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) +{ +} ////////////////////////////////////////////////////////////////////// @@ -1591,6 +3336,7 @@ BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow ) EVT_PAINT( wxGrid::OnPaint ) EVT_SIZE( wxGrid::OnSize ) EVT_KEY_DOWN( wxGrid::OnKeyDown ) + EVT_KEY_UP( wxGrid::OnKeyUp ) EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground ) END_EVENT_TABLE() @@ -1600,7 +3346,9 @@ wxGrid::wxGrid( wxWindow *parent, const wxSize& size, long style, const wxString& name ) - : wxScrolledWindow( parent, id, pos, size, style, name ) + : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ), + m_colMinWidths(GRID_HASH_SIZE), + m_rowMinHeights(GRID_HASH_SIZE) { Create(); } @@ -1609,7 +3357,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; @@ -1621,6 +3369,9 @@ wxGrid::~wxGrid() if (m_ownTable) delete m_table; + + delete m_typeRegistry; + delete m_selection; } @@ -1631,7 +3382,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; @@ -1640,7 +3390,16 @@ void wxGrid::Create() m_defaultCellAttr = new wxGridCellAttr; m_defaultCellAttr->SetDefAttr(m_defaultCellAttr); - // RD: Should we fill the default attrs now or is waiting until Init() okay? + + // Set default cell attributes + m_defaultCellAttr->SetFont(GetFont()); + m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP); + m_defaultCellAttr->SetTextColour( + wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT)); + m_defaultCellAttr->SetBackgroundColour( + wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer); + m_defaultCellAttr->SetEditor(new wxGridCellTextEditor); m_numRows = 0; @@ -1650,6 +3409,10 @@ void wxGrid::Create() m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH; m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; + // create the type registry + m_typeRegistry = new wxGridTypeRegistry; + m_selection = 0; + // subwindow components that make up the wxGrid m_cornerLabelWin = new wxGridCornerLabelWindow( this, -1, wxDefaultPosition, @@ -1676,29 +3439,38 @@ void wxGrid::Create() } -bool wxGrid::CreateGrid( int numRows, int numCols ) +bool wxGrid::CreateGrid( int numRows, int numCols, + wxGrid::wxGridSelectionModes selmode ) { - if ( m_created ) - { - wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); - return FALSE; - } - else - { - m_numRows = numRows; - m_numCols = numCols; + wxCHECK_MSG( !m_created, + FALSE, + wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); + + m_numRows = numRows; + m_numCols = numCols; - m_table = new wxGridStringTable( m_numRows, m_numCols ); - m_table->SetView( this ); - m_ownTable = TRUE; - Init(); - m_created = TRUE; - } + m_table = new wxGridStringTable( m_numRows, m_numCols ); + m_table->SetView( this ); + m_ownTable = TRUE; + m_selection = new wxGridSelection( this, selmode ); + Init(); + 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 ) { @@ -1707,6 +3479,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; } @@ -1719,6 +3492,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership ) m_table->SetView( this ); if (takeOwnership) m_ownTable = TRUE; + m_selection = new wxGridSelection( this, selmode ); Init(); m_created = TRUE; } @@ -1729,14 +3503,6 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership ) void wxGrid::Init() { - int i; - - if ( m_numRows <= 0 ) - m_numRows = WXGRID_DEFAULT_NUMBER_ROWS; - - if ( m_numCols <= 0 ) - m_numCols = WXGRID_DEFAULT_NUMBER_COLS; - m_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH; m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT; @@ -1759,11 +3525,11 @@ void wxGrid::Init() m_labelFont = this->GetFont(); m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 ); - m_rowLabelHorizAlign = wxLEFT; - m_rowLabelVertAlign = wxCENTRE; + m_rowLabelHorizAlign = wxALIGN_LEFT; + m_rowLabelVertAlign = wxALIGN_CENTRE; - m_colLabelHorizAlign = wxCENTRE; - m_colLabelVertAlign = wxTOP; + m_colLabelHorizAlign = wxALIGN_CENTRE; + m_colLabelVertAlign = wxALIGN_TOP; m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH; m_defaultRowHeight = m_gridWin->GetCharHeight(); @@ -1774,42 +3540,15 @@ void wxGrid::Init() m_defaultRowHeight += 4; #endif - m_rowHeights.Alloc( m_numRows ); - m_rowBottoms.Alloc( m_numRows ); - int rowBottom = 0; - for ( i = 0; i < m_numRows; i++ ) - { - m_rowHeights.Add( m_defaultRowHeight ); - rowBottom += m_defaultRowHeight; - m_rowBottoms.Add( rowBottom ); - } - - m_colWidths.Alloc( m_numCols ); - m_colRights.Alloc( m_numCols ); - int colRight = 0; - for ( i = 0; i < m_numCols; i++ ) - { - m_colWidths.Add( m_defaultColWidth ); - colRight += m_defaultColWidth; - m_colRights.Add( colRight ); - } - - // Set default cell attributes - m_defaultCellAttr->SetFont(GetFont()); - m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP); - m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer); - m_defaultCellAttr->SetEditor(new wxGridCellTextEditor); - m_defaultCellAttr->SetTextColour( - wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT)); - m_defaultCellAttr->SetBackgroundColour( - wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); - - m_gridLineColour = wxColour( 128, 128, 255 ); m_gridLinesEnabled = TRUE; + m_cellHighlightColour = m_gridLineColour; m_cursorMode = WXGRID_CURSOR_SELECT_CELL; m_winCapture = (wxWindow *)NULL; + m_canDragRowSize = TRUE; + m_canDragColSize = TRUE; + m_canDragGridSize = TRUE; m_dragLastPos = -1; m_dragRowOrCol = -1; m_isDragging = FALSE; @@ -1822,8 +3561,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); @@ -1832,18 +3571,98 @@ void wxGrid::Init() m_inOnKeyDown = FALSE; m_batchCount = 0; + m_extraWidth = + m_extraHeight = 50; + + CalcDimensions(); +} + +// ---------------------------------------------------------------------------- +// the idea is to call these functions only when necessary because they create +// quite big arrays which eat memory mostly unnecessary - in particular, if +// default widths/heights are used for all rows/columns, we may not use these +// arrays at all +// +// with some extra code, it should be possible to only store the +// widths/heights different from default ones but this will be done later... +// ---------------------------------------------------------------------------- + +void wxGrid::InitRowHeights() +{ + m_rowHeights.Empty(); + m_rowBottoms.Empty(); + + m_rowHeights.Alloc( m_numRows ); + m_rowBottoms.Alloc( m_numRows ); + + int rowBottom = 0; + for ( int i = 0; i < m_numRows; i++ ) + { + m_rowHeights.Add( m_defaultRowHeight ); + rowBottom += m_defaultRowHeight; + m_rowBottoms.Add( rowBottom ); + } +} + +void wxGrid::InitColWidths() +{ + m_colWidths.Empty(); + m_colRights.Empty(); + + m_colWidths.Alloc( m_numCols ); + m_colRights.Alloc( m_numCols ); + int colRight = 0; + for ( int i = 0; i < m_numCols; i++ ) + { + m_colWidths.Add( m_defaultColWidth ); + colRight += m_defaultColWidth; + m_colRights.Add( colRight ); + } +} + +int wxGrid::GetColWidth(int col) const +{ + return m_colWidths.IsEmpty() ? m_defaultColWidth : m_colWidths[col]; +} + +int wxGrid::GetColLeft(int col) const +{ + return m_colRights.IsEmpty() ? col * m_defaultColWidth + : m_colRights[col] - m_colWidths[col]; +} + +int wxGrid::GetColRight(int col) const +{ + return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth + : m_colRights[col]; +} + +int wxGrid::GetRowHeight(int row) const +{ + return m_rowHeights.IsEmpty() ? m_defaultRowHeight : m_rowHeights[row]; +} + +int wxGrid::GetRowTop(int row) const +{ + return m_rowBottoms.IsEmpty() ? row * m_defaultRowHeight + : m_rowBottoms[row] - m_rowHeights[row]; } +int wxGrid::GetRowBottom(int row) const +{ + return m_rowBottoms.IsEmpty() ? (row + 1) * m_defaultRowHeight + : m_rowBottoms[row]; +} void wxGrid::CalcDimensions() { int cw, ch; GetClientSize( &cw, &ch ); - if ( m_numRows > 0 && m_numCols > 0 ) + if ( m_numRows > 0 || m_numCols > 0 ) { - int right = m_colRights[ m_numCols-1 ] + 50; - int bottom = m_rowBottoms[ m_numRows-1 ] + 50; + int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0; + int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0; // TODO: restore the scroll position that we had before sizing // @@ -1881,6 +3700,21 @@ void wxGrid::CalcWindowSizes() bool wxGrid::Redimension( wxGridTableMessage& msg ) { int i; + bool result = FALSE; + +#if 0 + // if we were using the default widths/heights so far, we must change them + // now + if ( m_colWidths.IsEmpty() ) + { + InitColWidths(); + } + + if ( m_rowHeights.IsEmpty() ) + { + InitRowHeights(); + } +#endif switch ( msg.GetId() ) { @@ -1888,71 +3722,99 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) { size_t pos = msg.GetCommandInt(); int numRows = msg.GetCommandInt2(); - for ( i = 0; i < numRows; i++ ) - { - m_rowHeights.Insert( m_defaultRowHeight, pos ); - m_rowBottoms.Insert( 0, pos ); - } + m_numRows += numRows; - int bottom = 0; - if ( pos > 0 ) bottom = m_rowBottoms[pos-1]; + if ( !m_rowHeights.IsEmpty() ) + { + for ( i = 0; i < numRows; i++ ) + { + m_rowHeights.Insert( m_defaultRowHeight, pos ); + m_rowBottoms.Insert( 0, pos ); + } + + int bottom = 0; + if ( pos > 0 ) bottom = m_rowBottoms[pos-1]; + + for ( i = pos; i < m_numRows; i++ ) + { + bottom += m_rowHeights[i]; + m_rowBottoms[i] = bottom; + } + } + if ( m_currentCellCoords == wxGridNoCellCoords ) + { + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); + } + m_selection->UpdateRows( pos, numRows ); + wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); + if (attrProvider) + attrProvider->UpdateAttrRows( pos, numRows ); - for ( i = pos; i < m_numRows; i++ ) + if ( !GetBatchCount() ) { - bottom += m_rowHeights[i]; - m_rowBottoms[i] = bottom; + CalcDimensions(); + m_rowLabelWin->Refresh(); } - CalcDimensions(); } - return TRUE; + result = TRUE; + break; case wxGRIDTABLE_NOTIFY_ROWS_APPENDED: { int numRows = msg.GetCommandInt(); - for ( i = 0; i < numRows; i++ ) - { - m_rowHeights.Add( m_defaultRowHeight ); - m_rowBottoms.Add( 0 ); - } - int oldNumRows = m_numRows; m_numRows += numRows; - int bottom = 0; - if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1]; + if ( !m_rowHeights.IsEmpty() ) + { + for ( i = 0; i < numRows; i++ ) + { + m_rowHeights.Add( m_defaultRowHeight ); + m_rowBottoms.Add( 0 ); + } + + int bottom = 0; + if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1]; - for ( i = oldNumRows; i < m_numRows; i++ ) + for ( i = oldNumRows; i < m_numRows; i++ ) + { + bottom += m_rowHeights[i]; + m_rowBottoms[i] = bottom; + } + } + if ( m_currentCellCoords == wxGridNoCellCoords ) + { + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); + } + if ( !GetBatchCount() ) { - bottom += m_rowHeights[i]; - m_rowBottoms[i] = bottom; + CalcDimensions(); + m_rowLabelWin->Refresh(); } - CalcDimensions(); } - return TRUE; + result = TRUE; + break; case wxGRIDTABLE_NOTIFY_ROWS_DELETED: { size_t pos = msg.GetCommandInt(); int numRows = msg.GetCommandInt2(); - for ( i = 0; i < numRows; i++ ) - { - m_rowHeights.Remove( pos ); - m_rowBottoms.Remove( pos ); - } m_numRows -= numRows; - if ( !m_numRows ) - { - m_numCols = 0; - m_colWidths.Clear(); - m_colRights.Clear(); - m_currentCellCoords = wxGridNoCellCoords; - } - else + if ( !m_rowHeights.IsEmpty() ) { - if ( m_currentCellCoords.GetRow() >= m_numRows ) - m_currentCellCoords.Set( 0, 0 ); + for ( i = 0; i < numRows; i++ ) + { + m_rowHeights.Remove( pos ); + m_rowBottoms.Remove( pos ); + } int h = 0; for ( i = 0; i < m_numRows; i++ ) @@ -1961,82 +3823,134 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowBottoms[i] = h; } } - - CalcDimensions(); + if ( !m_numRows ) + { + m_currentCellCoords = wxGridNoCellCoords; + } + else + { + if ( m_currentCellCoords.GetRow() >= m_numRows ) + m_currentCellCoords.Set( 0, 0 ); + } + m_selection->UpdateRows( pos, -((int)numRows) ); + wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); + if (attrProvider) { + attrProvider->UpdateAttrRows( pos, -((int)numRows) ); +// 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. + // I hate to do this here, but the + // needed data is not available inside UpdateAttrRows. + if ( !GetNumberRows() ) + attrProvider->UpdateAttrCols( 0, -GetNumberCols() ); +#endif + } + if ( !GetBatchCount() ) + { + CalcDimensions(); + m_rowLabelWin->Refresh(); + } } - return TRUE; + result = TRUE; + break; case wxGRIDTABLE_NOTIFY_COLS_INSERTED: { size_t pos = msg.GetCommandInt(); int numCols = msg.GetCommandInt2(); - for ( i = 0; i < numCols; i++ ) - { - m_colWidths.Insert( m_defaultColWidth, pos ); - m_colRights.Insert( 0, pos ); - } m_numCols += numCols; - int right = 0; - if ( pos > 0 ) right = m_colRights[pos-1]; + if ( !m_colWidths.IsEmpty() ) + { + for ( i = 0; i < numCols; i++ ) + { + m_colWidths.Insert( m_defaultColWidth, pos ); + m_colRights.Insert( 0, pos ); + } + + int right = 0; + if ( pos > 0 ) right = m_colRights[pos-1]; - for ( i = pos; i < m_numCols; i++ ) + for ( i = pos; i < m_numCols; i++ ) + { + right += m_colWidths[i]; + m_colRights[i] = right; + } + } + if ( m_currentCellCoords == wxGridNoCellCoords ) { - right += m_colWidths[i]; - m_colRights[i] = right; + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); } - CalcDimensions(); + m_selection->UpdateCols( pos, numCols ); + wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); + if (attrProvider) + attrProvider->UpdateAttrCols( pos, numCols ); + if ( !GetBatchCount() ) + { + CalcDimensions(); + m_colLabelWin->Refresh(); + } + } - return TRUE; + result = TRUE; + break; case wxGRIDTABLE_NOTIFY_COLS_APPENDED: { int numCols = msg.GetCommandInt(); - for ( i = 0; i < numCols; i++ ) - { - m_colWidths.Add( m_defaultColWidth ); - m_colRights.Add( 0 ); - } - int oldNumCols = m_numCols; m_numCols += numCols; + if ( !m_colWidths.IsEmpty() ) + { + for ( i = 0; i < numCols; i++ ) + { + m_colWidths.Add( m_defaultColWidth ); + m_colRights.Add( 0 ); + } - int right = 0; - if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1]; + int right = 0; + if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1]; - for ( i = oldNumCols; i < m_numCols; i++ ) + for ( i = oldNumCols; i < m_numCols; i++ ) + { + right += m_colWidths[i]; + m_colRights[i] = right; + } + } + if ( m_currentCellCoords == wxGridNoCellCoords ) + { + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); + } + if ( !GetBatchCount() ) { - right += m_colWidths[i]; - m_colRights[i] = right; + CalcDimensions(); + m_colLabelWin->Refresh(); } - CalcDimensions(); } - return TRUE; + result = TRUE; + break; case wxGRIDTABLE_NOTIFY_COLS_DELETED: { size_t pos = msg.GetCommandInt(); int numCols = msg.GetCommandInt2(); - for ( i = 0; i < numCols; i++ ) - { - m_colWidths.Remove( pos ); - m_colRights.Remove( pos ); - } m_numCols -= numCols; - if ( !m_numCols ) + if ( !m_colWidths.IsEmpty() ) { -#if 0 // leave the row alone here so that AppendCols will work subsequently - m_numRows = 0; - m_rowHeights.Clear(); - m_rowBottoms.Clear(); -#endif - m_currentCellCoords = wxGridNoCellCoords; - } - else - { - if ( m_currentCellCoords.GetCol() >= m_numCols ) - m_currentCellCoords.Set( 0, 0 ); + for ( i = 0; i < numCols; i++ ) + { + m_colWidths.Remove( pos ); + m_colRights.Remove( pos ); + } int w = 0; for ( i = 0; i < m_numCols; i++ ) @@ -2045,16 +3959,51 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_colRights[i] = w; } } - CalcDimensions(); + if ( !m_numCols ) + { + m_currentCellCoords = wxGridNoCellCoords; + } + else + { + if ( m_currentCellCoords.GetCol() >= m_numCols ) + m_currentCellCoords.Set( 0, 0 ); + } + m_selection->UpdateCols( pos, -((int)numCols) ); + wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); + if (attrProvider) { + attrProvider->UpdateAttrCols( pos, -((int)numCols) ); +// 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. + // I hate to do this here, but the + // needed data is not available inside UpdateAttrCols. + if ( !GetNumberCols() ) + attrProvider->UpdateAttrRows( 0, -GetNumberRows() ); +#endif + } + if ( !GetBatchCount() ) + { + CalcDimensions(); + m_colLabelWin->Refresh(); + } + return TRUE; } - return TRUE; +#if 0 +// There is no path to this code !!!!!! + result = TRUE; + break; +#endif } - return FALSE; + if (result && !GetBatchCount() ) + m_gridWin->Refresh(); + return result; } -void wxGrid::CalcRowLabelsExposed( wxRegion& reg ) +void wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; @@ -2087,13 +4036,13 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg ) // find the row labels within these bounds // int row; - int rowTop; for ( row = 0; row < m_numRows; row++ ) { - if ( m_rowBottoms[row] < top ) continue; + if ( GetRowBottom(row) < top ) + continue; - rowTop = m_rowBottoms[row] - m_rowHeights[row]; - if ( rowTop > bottom ) break; + if ( GetRowTop(row) > bottom ) + break; m_rowLabelsExposed.Add( row ); } @@ -2103,7 +4052,7 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg ) } -void wxGrid::CalcColLabelsExposed( wxRegion& reg ) +void wxGrid::CalcColLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; @@ -2136,13 +4085,13 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg ) // find the cells within these bounds // int col; - int colLeft; for ( col = 0; col < m_numCols; col++ ) { - if ( m_colRights[col] < left ) continue; + if ( GetColRight(col) < left ) + continue; - colLeft = m_colRights[col] - m_colWidths[col]; - if ( colLeft > right ) break; + if ( GetColLeft(col) > right ) + break; m_colLabelsExposed.Add( col ); } @@ -2152,7 +4101,7 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg ) } -void wxGrid::CalcCellsExposed( wxRegion& reg ) +void wxGrid::CalcCellsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; @@ -2188,29 +4137,31 @@ void wxGrid::CalcCellsExposed( wxRegion& reg ) // find the cells within these bounds // int row, col; - int colLeft, rowTop; for ( row = 0; row < m_numRows; row++ ) { - if ( m_rowBottoms[row] <= top ) continue; + if ( GetRowBottom(row) <= top ) + continue; - rowTop = m_rowBottoms[row] - m_rowHeights[row]; - if ( rowTop > bottom ) break; + if ( GetRowTop(row) > bottom ) + break; m_rowsExposed.Add( row ); for ( col = 0; col < m_numCols; col++ ) { - if ( m_colRights[col] <= left ) continue; + if ( GetColRight(col) <= left ) + continue; - colLeft = m_colRights[col] - m_colWidths[col]; - if ( colLeft > right ) break; + if ( GetColLeft(col) > right ) + break; - if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) m_colsExposed.Add( col ); + if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) + m_colsExposed.Add( col ); m_cellsExposed.Add( wxGridCellCoords( row, col ) ); } } - iter++ ; + iter++; } } @@ -2238,9 +4189,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); y = wxMax( y, - m_rowBottoms[m_dragRowOrCol] - - m_rowHeights[m_dragRowOrCol] + - WXGRID_MIN_ROW_HEIGHT ); + GetRowTop(m_dragRowOrCol) + + GetRowMinimalHeight(m_dragRowOrCol) ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2252,10 +4202,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 @@ -2290,9 +4243,25 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { row = YToRow(y); if ( row >= 0 && - !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) + !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) { - SelectRow( row, event.ShiftDown() ); + 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); } } @@ -2300,7 +4269,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { // starting to drag-resize a row // - ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin); + if ( CanDragRowSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin); } } @@ -2312,7 +4282,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if ( YToEdgeOfRow(y) < 0 ) { row = YToRow(y); - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ); + SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, row, -1, event ); } } @@ -2328,7 +4298,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) // Note: we are ending the event *after* doing // default processing in this case // - SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); + SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); } ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); @@ -2341,7 +4311,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDown() ) { row = YToRow(y); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, row, -1, event ) ) { // no default action at the moment } @@ -2353,7 +4323,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDClick() ) { row = YToRow(y); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, row, -1, event ) ) { // no default action at the moment } @@ -2370,7 +4340,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { // don't capture the mouse yet - ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE); + if ( CanDragRowSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE); } } else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) @@ -2403,10 +4374,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - x = wxMax( x, - m_colRights[m_dragRowOrCol] - - m_colWidths[m_dragRowOrCol] + - WXGRID_MIN_COL_WIDTH ); + + x = wxMax( x, GetColLeft(m_dragRowOrCol) + + GetColMinimalWidth(m_dragRowOrCol)); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2418,10 +4388,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 @@ -2456,9 +4429,24 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { col = XToCol(x); if ( col >= 0 && - !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) + !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) { - SelectCol( col, event.ShiftDown() ); + 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); } } @@ -2466,7 +4454,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { // starting to drag-resize a col // - ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin); + if ( CanDragColSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin); } } @@ -2478,7 +4467,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if ( XToEdgeOfCol(x) < 0 ) { col = XToCol(x); - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ); + SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, col, event ); } } @@ -2494,7 +4483,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) // Note: we are ending the event *after* doing // default processing in this case // - SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); + SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); } ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); @@ -2507,7 +4496,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDown() ) { col = XToCol(x); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, col, event ) ) { // no default action at the moment } @@ -2519,7 +4508,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDClick() ) { col = XToCol(x); - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, col, event ) ) { // no default action at the moment } @@ -2536,7 +4525,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { // don't capture the cursor yet - ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE); + if ( CanDragColSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE); } } else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) @@ -2554,7 +4544,7 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) // indicate corner label by having both row and // col args == -1 // - if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, -1, event ) ) { SelectAll(); } @@ -2562,12 +4552,12 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) else if ( event.LeftDClick() ) { - SendEvent( EVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event ); + SendEvent( wxEVT_GRID_LABEL_LEFT_DCLICK, -1, -1, event ); } else if ( event.RightDown() ) { - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_CLICK, -1, -1, event ) ) { // no default action at the moment } @@ -2575,7 +4565,7 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event ) else if ( event.RightDClick() ) { - if ( !SendEvent( EVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) ) + if ( !SendEvent( wxEVT_GRID_LABEL_RIGHT_DCLICK, -1, -1, event ) ) { // no default action at the moment } @@ -2661,8 +4651,10 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // Don't start doing anything until the mouse has been drug at // least 3 pixels in any direction... - if (! m_isDragging) { - if (m_startDragPos == wxDefaultPosition) { + if (! m_isDragging) + { + if (m_startDragPos == wxDefaultPosition) + { m_startDragPos = pos; return; } @@ -2675,30 +4667,44 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { // Hide the edit control, so it // won't interfer with drag-shrinking. - if ( IsCellEditControlEnabled() ) + if ( IsCellEditControlShown() ) + { HideCellEditControl(); + SaveEditControlValue(); + } // Have we captured the mouse yet? - if (! m_winCapture) { + if (! m_winCapture) + { m_winCapture = m_gridWin; m_winCapture->CaptureMouse(); } if ( coords != wxGridNoCellCoords ) { - if ( !IsSelection() ) + if ( event.ControlDown() ) { - SelectBlock( coords, coords ); + if ( m_selectingKeyboard == wxGridNoCellCoords) + m_selectingKeyboard = coords; + HighlightBlock ( m_selectingKeyboard, coords ); } else { - SelectBlock( m_currentCellCoords, coords ); + if ( !IsSelection() ) + { + HighlightBlock( coords, coords ); + } + else + { + HighlightBlock( m_currentCellCoords, coords ); + } } - if (! IsVisible(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. } } } @@ -2710,10 +4716,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - y = wxMax( y, - m_rowBottoms[m_dragRowOrCol] - - m_rowHeights[m_dragRowOrCol] + - WXGRID_MIN_ROW_HEIGHT ); + y = wxMax( y, GetRowTop(m_dragRowOrCol) + + GetRowMinimalHeight(m_dragRowOrCol) ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2730,9 +4734,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - x = wxMax( x, - m_colRights[m_dragRowOrCol] - - m_colWidths[m_dragRowOrCol] + WXGRID_MIN_COL_WIDTH ); + x = wxMax( x, GetColLeft(m_dragRowOrCol) + + GetColMinimalWidth(m_dragRowOrCol) ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2748,191 +4751,244 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) m_isDragging = FALSE; m_startDragPos = wxDefaultPosition; - - if ( coords != wxGridNoCellCoords ) - { - // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL - // immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under - // wxGTK + // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL + // immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under + // wxGTK #if 0 - if ( event.Entering() || event.Leaving() ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - m_gridWin->SetCursor( *wxSTANDARD_CURSOR ); - } - else + if ( event.Entering() || event.Leaving() ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + m_gridWin->SetCursor( *wxSTANDARD_CURSOR ); + } + else #endif // 0 - // ------------ Left button pressed - // - if ( event.LeftDown() ) + // ------------ Left button pressed + // + if ( event.LeftDown() && coords != wxGridNoCellCoords ) + { + if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK, + coords.GetRow(), + coords.GetCol(), + event ) ) { - EnableCellEditControl( FALSE ); + if ( !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 ) { - if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK, - coords.GetRow(), - coords.GetCol(), - event ) ) + DisableCellEditControl(); + MakeCellVisible( coords ); + + // if this is the second click on this cell then start + // the edit control + if ( m_waitForSlowClick && + (coords == m_currentCellCoords) && + CanEnableCellControl()) + { + EnableCellEditControl(); + + wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); + wxGridCellEditor *editor = attr->GetEditor(this, + coords.GetRow(), + coords.GetCol()); + editor->StartingClick(); + editor->DecRef(); + attr->DecRef(); + + m_waitForSlowClick = FALSE; + } + else { - MakeCellVisible( coords ); - - // if this is the second click on this cell then start - // the edit control - if (m_waitForSlowClick && coords == m_currentCellCoords) { - EnableCellEditControl(TRUE); - ShowCellEditControl(); - m_waitForSlowClick = FALSE; + 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 { + else + { SetCurrentCell( coords ); - m_waitForSlowClick = TRUE; + if ( m_selection->GetSelectionMode() + != wxGrid::wxGridSelectCells) + HighlightBlock( coords, coords ); } + m_waitForSlowClick = TRUE; } } } + } - // ------------ Left double click - // - else if ( event.LeftDClick() ) + // ------------ Left double click + // + else if ( event.LeftDClick() && coords != wxGridNoCellCoords ) + { + DisableCellEditControl(); + + if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) { - EnableCellEditControl( FALSE ); - if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) - { - SendEvent( EVT_GRID_CELL_LEFT_DCLICK, - coords.GetRow(), - coords.GetCol(), - event ); - } + SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK, + coords.GetRow(), + coords.GetCol(), + event ); } + } - // ------------ Left button released - // - else if ( event.LeftUp() ) + // ------------ Left button released + // + else if ( event.LeftUp() ) + { + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) + if ( m_selectingTopLeft != wxGridNoCellCoords && + m_selectingBottomRight != wxGridNoCellCoords ) { - if ( IsSelection() ) + if (m_winCapture) { - if (m_winCapture) { - m_winCapture->ReleaseMouse(); - m_winCapture = NULL; - } - SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event ); + m_winCapture->ReleaseMouse(); + m_winCapture = NULL; } - - // Show the edit control, if it has - // been hidden for drag-shrinking. - if ( IsCellEditControlEnabled() ) - ShowCellEditControl(); + 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; } - else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - DoEndDragResizeRow(); - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); - } - else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - DoEndDragResizeCol(); + // Show the edit control, if it has been hidden for + // drag-shrinking. + ShowCellEditControl(); + } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + DoEndDragResizeRow(); - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); - } + // Note: we are ending the event *after* doing + // default processing in this case + // + SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); + } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + DoEndDragResizeCol(); - m_dragLastPos = -1; + // Note: we are ending the event *after* doing + // default processing in this case + // + SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event ); } + m_dragLastPos = -1; + } + - // ------------ Right button down - // - else if ( event.RightDown() ) + // ------------ Right button down + // + else if ( event.RightDown() && coords != wxGridNoCellCoords ) + { + DisableCellEditControl(); + if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK, + coords.GetRow(), + coords.GetCol(), + event ) ) { - EnableCellEditControl( FALSE ); - if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK, - coords.GetRow(), - coords.GetCol(), - event ) ) - { - // no default action at the moment - } + // no default action at the moment } + } - // ------------ Right double click - // - else if ( event.RightDClick() ) + // ------------ Right double click + // + else if ( event.RightDClick() && coords != wxGridNoCellCoords ) + { + DisableCellEditControl(); + if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK, + coords.GetRow(), + coords.GetCol(), + event ) ) { - EnableCellEditControl( FALSE ); - if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK, - coords.GetRow(), - coords.GetCol(), - event ) ) - { - // no default action at the moment - } + // no default action at the moment } + } + + // ------------ Moving and no button action + // + else if ( event.Moving() && !event.IsButton() ) + { + int dragRow = YToEdgeOfRow( y ); + int dragCol = XToEdgeOfCol( x ); - // ------------ Moving and no button action + // Dragging on the corner of a cell to resize in both + // directions is not implemented yet... // - else if ( event.Moving() && !event.IsButton() ) + if ( dragRow >= 0 && dragCol >= 0 ) { - int dragRow = YToEdgeOfRow( y ); - int dragCol = XToEdgeOfCol( x ); + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + return; + } - // Dragging on the corner of a cell to resize in both - // directions is not implemented yet... - // - if ( dragRow >= 0 && dragCol >= 0 ) - { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); - return; - } + if ( dragRow >= 0 ) + { + m_dragRowOrCol = dragRow; - if ( dragRow >= 0 ) + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - m_dragRowOrCol = dragRow; - - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { + if ( CanDragRowSize() && CanDragGridSize() ) ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW); - } - - return; } if ( dragCol >= 0 ) { m_dragRowOrCol = dragCol; + } - if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) - { - ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL); - } + return; + } - return; - } + if ( dragCol >= 0 ) + { + m_dragRowOrCol = dragCol; - // Neither on a row or col edge - // - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + if ( CanDragColSize() && CanDragGridSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL); } + + return; + } + + // Neither on a row or col edge + // + if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); } } } @@ -2953,8 +5009,9 @@ void wxGrid::DoEndDragResizeRow() dc.SetLogicalFunction( wxINVERT ); dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); HideCellEditControl(); + SaveEditControlValue(); - int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol]; + int rowTop = GetRowTop(m_dragRowOrCol); SetRowSize( m_dragRowOrCol, wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) ); @@ -2991,10 +5048,12 @@ void wxGrid::DoEndDragResizeCol() dc.SetLogicalFunction( wxINVERT ); dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); HideCellEditControl(); + SaveEditControlValue(); - int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol]; + int colLeft = GetColLeft(m_dragRowOrCol); SetColSize( m_dragRowOrCol, - wxMax( m_dragLastPos - colLeft, WXGRID_MIN_COL_WIDTH ) ); + wxMax( m_dragLastPos - colLeft, + GetColMinimalWidth(m_dragRowOrCol) ) ); if ( !GetBatchCount() ) { @@ -3052,8 +5111,10 @@ void wxGrid::ClearGrid() { if ( m_table ) { + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + m_table->Clear(); - SetEditControlValue(); if ( !GetBatchCount() ) m_gridWin->Refresh(); } } @@ -3071,41 +5132,15 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if ( m_table ) { - bool ok = m_table->InsertRows( pos, numRows ); + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + + return m_table->InsertRows( pos, numRows ); // the table will have sent the results of the insert row // operation to this view object as a grid table message - // - if ( ok ) - { - if ( m_numCols == 0 ) - { - m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS ); - // - // TODO: perhaps instead of appending the default number of cols - // we should remember what the last non-zero number of cols was ? - // - } - - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - } - - SetEditControlValue(); - return ok; - } - else - { - return FALSE; } + return FALSE; } @@ -3119,27 +5154,9 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) return FALSE; } - if ( m_table && m_table->AppendRows( numRows ) ) - { - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - // 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; - } - else - { - return FALSE; - } + return ( m_table && m_table->AppendRows( numRows ) ); + // the table will have sent the results of the append row + // operation to this view object as a grid table message } @@ -3153,24 +5170,16 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) return FALSE; } - if ( m_table && m_table->DeleteRows( pos, numRows ) ) + if ( m_table ) { + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + + return (m_table->DeleteRows( pos, numRows )); // the table will have sent the results of the delete row // operation to this view object as a grid table message - // - if ( m_numRows > 0 ) - SetEditControlValue(); - else - HideCellEditControl(); - - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - return TRUE; - } - else - { - return FALSE; } + return FALSE; } @@ -3186,33 +5195,14 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if ( m_table ) { - HideCellEditControl(); - bool ok = m_table->InsertCols( pos, numCols ); + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + return m_table->InsertCols( pos, numCols ); // the table will have sent the results of the insert col // operation to this view object as a grid table message - // - if ( ok ) - { - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - } - - SetEditControlValue(); - return ok; - } - else - { - return FALSE; } + return FALSE; } @@ -3226,27 +5216,9 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) return FALSE; } - if ( m_table && m_table->AppendCols( numCols ) ) - { - // the table will have sent the results of the append col - // operation to this view object as a grid table message - // - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - return TRUE; - } - else - { - return FALSE; - } + return ( m_table && m_table->AppendCols( numCols ) ); + // the table will have sent the results of the append col + // operation to this view object as a grid table message } @@ -3260,24 +5232,16 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) return FALSE; } - if ( m_table && m_table->DeleteCols( pos, numCols ) ) + if ( m_table ) { + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + + return ( m_table->DeleteCols( pos, numCols ) ); // the table will have sent the results of the delete col // operation to this view object as a grid table message - // - if ( m_numCols > 0 ) - SetEditControlValue(); - else - HideCellEditControl(); - - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - return TRUE; - } - else - { - return FALSE; } + return FALSE; } @@ -3293,8 +5257,7 @@ bool wxGrid::SendEvent( const wxEventType type, int row, int col, wxMouseEvent& mouseEv ) { - if ( type == EVT_GRID_ROW_SIZE || - type == EVT_GRID_COL_SIZE ) + if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { int rowOrCol = (row == -1 ? col : row); @@ -3302,7 +5265,8 @@ bool wxGrid::SendEvent( const wxEventType type, type, this, rowOrCol, - mouseEv.GetX(), mouseEv.GetY(), + mouseEv.GetX() + GetColLabelSize(), + mouseEv.GetY() + GetRowLabelSize(), mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -3310,13 +5274,15 @@ bool wxGrid::SendEvent( const wxEventType type, return GetEventHandler()->ProcessEvent(gridEvt); } - else if ( type == EVT_GRID_RANGE_SELECT ) + 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(), @@ -3330,7 +5296,9 @@ bool wxGrid::SendEvent( const wxEventType type, type, this, row, col, - mouseEv.GetX(), mouseEv.GetY(), + mouseEv.GetX() + GetColLabelSize(), + mouseEv.GetY() + GetRowLabelSize(), + FALSE, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), @@ -3347,8 +5315,7 @@ bool wxGrid::SendEvent( const wxEventType type, bool wxGrid::SendEvent( const wxEventType type, int row, int col ) { - if ( type == EVT_GRID_ROW_SIZE || - type == EVT_GRID_COL_SIZE ) + if ( type == wxEVT_GRID_ROW_SIZE || type == wxEVT_GRID_COL_SIZE ) { int rowOrCol = (row == -1 ? col : row); @@ -3373,17 +5340,7 @@ 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); - SetEditControlValue(); - ShowCellEditControl(); - } - - m_displayed = TRUE; + wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW } @@ -3391,7 +5348,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(); @@ -3417,6 +5374,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) ) { + // try local handlers // switch ( event.KeyCode() ) @@ -3424,63 +5382,99 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) 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; case WXK_RETURN: + case WXK_NUMPAD_ENTER: if ( event.ControlDown() ) { event.Skip(); // to let the edit control have the return } else { - MoveCursorDown(); + if ( GetGridCursorRow() < GetNumberRows()-1 ) + { + MoveCursorDown( event.ShiftDown() ); + } + else + { + // at the bottom of a column + HideCellEditControl(); + SaveEditControlValue(); + } } break; + case WXK_ESCAPE: + ClearSelection(); + break; + case WXK_TAB: if (event.ShiftDown()) - MoveCursorLeft(); + { + if ( GetGridCursorCol() > 0 ) + { + MoveCursorLeft( FALSE ); + } + else + { + // at left of grid + HideCellEditControl(); + SaveEditControlValue(); + } + } else - MoveCursorRight(); + { + if ( GetGridCursorCol() < GetNumberCols()-1 ) + { + MoveCursorRight( FALSE ); + } + else + { + // at right of grid + HideCellEditControl(); + SaveEditControlValue(); + } + } break; case WXK_HOME: @@ -3515,32 +5509,56 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) MovePageDown(); break; - // We don't want these keys to trigger the edit control, any others? - case WXK_SHIFT: - case WXK_ALT: - case WXK_CONTROL: - case WXK_CAPITAL: - event.Skip(); - break; - case WXK_SPACE: + if ( 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 - default: - // now try the cell edit control - // - if ( !IsCellEditControlEnabled() ) - EnableCellEditControl( TRUE ); - if (IsCellEditControlEnabled()) { - wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); - attr->GetEditor()->StartingKey(event); + default: + // is it possible to edit the current cell at all? + if ( !IsCellEditControlEnabled() && CanEnableCellControl() ) + { + // yes, now check whether the cells editor accepts the key + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor *editor = attr->GetEditor(this, row, col); + + // is special and will always start editing, for + // other keys - ask the editor itself + if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers()) + || editor->IsAcceptedKey(event) ) + { + EnableCellEditControl(); + editor->StartingKey(event); + } + else + { + event.Skip(); + } + + editor->DecRef(); attr->DecRef(); } + else + { + // let others process char events with modifiers or all + // char events for readonly cells + event.Skip(); + } break; } } @@ -3548,51 +5566,210 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) m_inOnKeyDown = FALSE; } +void wxGrid::OnKeyUp( wxKeyEvent& event ) +{ + // try local handlers + // + if ( event.KeyCode() == WXK_SHIFT ) + { + if ( m_selectingTopLeft != wxGridNoCellCoords && + m_selectingBottomRight != wxGridNoCellCoords ) + m_selection->SelectBlock( m_selectingTopLeft.GetRow(), + m_selectingTopLeft.GetCol(), + m_selectingBottomRight.GetRow(), + m_selectingBottomRight.GetCol(), + event.ControlDown(), + TRUE, + event.AltDown(), + event.MetaDown() ); + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; + m_selectingKeyboard = wxGridNoCellCoords; + } +} void wxGrid::OnEraseBackground(wxEraseEvent&) -{ } - - - +{ +} void wxGrid::SetCurrentCell( const wxGridCellCoords& coords ) { - if ( SendEvent( EVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) ) + if ( SendEvent( wxEVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) ) { // the event has been intercepted - do nothing return; } - if ( m_displayed && - m_currentCellCoords != wxGridNoCellCoords ) + wxClientDC dc(m_gridWin); + PrepareDC(dc); + + if ( m_currentCellCoords != wxGridNoCellCoords ) { HideCellEditControl(); - SaveEditControlValue(); - EnableCellEditControl(FALSE); + DisableCellEditControl(); + + if ( IsVisible( m_currentCellCoords, FALSE ) ) + { + wxRect r; + r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); + if ( !m_gridLinesEnabled ) + { + r.x--; + r.y--; + r.width++; + r.height++; + } + + CalcCellsExposed( r ); + + // Otherwise refresh redraws the highlight! + m_currentCellCoords = coords; - // Clear the old current cell highlight - wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords); - m_currentCellCoords = coords; // Otherwise refresh redraws the highlight! - m_gridWin->Refresh( FALSE, &r ); + DrawGridCellArea(dc); + DrawAllGridLines( dc, r ); + } } m_currentCellCoords = coords; - SetEditControlValue(); + wxGridCellAttr* attr = GetCellAttr(coords); + DrawCellHighlight(dc, attr); + attr->DecRef(); +} + - if ( m_displayed ) +void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol ) +{ + int temp; + wxGridCellCoords updateTopLeft, updateBottomRight; + + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) + { + leftCol = 0; + rightCol = GetNumberCols() - 1; + } + else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) + { + topRow = 0; + bottomRow = GetNumberRows() - 1; + } + if ( topRow > bottomRow ) + { + temp = topRow; + topRow = bottomRow; + bottomRow = temp; + } + + if ( leftCol > rightCol ) { - wxClientDC dc(m_gridWin); - PrepareDC(dc); - DrawCellHighlight(dc); + temp = leftCol; + leftCol = rightCol; + rightCol = temp; + } + + updateTopLeft = wxGridCellCoords( topRow, leftCol ); + updateBottomRight = wxGridCellCoords( bottomRow, rightCol ); + + if ( m_selectingTopLeft != updateTopLeft || + m_selectingBottomRight != updateBottomRight ) + { + // Compute two optimal update rectangles: + // Either one rectangle is a real subset of the + // other, or they are (almost) disjoint! + wxRect rect[4]; + bool need_refresh[4]; + need_refresh[0] = + need_refresh[1] = + need_refresh[2] = + need_refresh[3] = FALSE; + int i; + + // Store intermediate values + wxCoord oldLeft = m_selectingTopLeft.GetCol(); + wxCoord oldTop = m_selectingTopLeft.GetRow(); + wxCoord oldRight = m_selectingBottomRight.GetCol(); + wxCoord oldBottom = m_selectingBottomRight.GetRow(); - if ( IsSelection() ) + // Determine the outer/inner coordinates. + if (oldLeft > leftCol) { - wxRect r( SelectionToDeviceRect() ); - ClearSelection(); - if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r ); + temp = oldLeft; + oldLeft = leftCol; + leftCol = temp; + } + if (oldTop > topRow ) + { + temp = oldTop; + oldTop = topRow; + topRow = temp; + } + if (oldRight < rightCol ) + { + temp = oldRight; + oldRight = rightCol; + rightCol = temp; + } + if (oldBottom < bottomRow) + { + temp = oldBottom; + oldBottom = bottomRow; + bottomRow = temp; + } + + // Now, either the stuff marked old is the outer + // rectangle or we don't have a situation where one + // is contained in the other. + + if ( oldLeft < leftCol ) + { + need_refresh[0] = TRUE; + rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, + oldLeft ), + wxGridCellCoords ( oldBottom, + leftCol - 1 ) ); + } + + if ( oldTop < topRow ) + { + need_refresh[1] = TRUE; + rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, + leftCol ), + wxGridCellCoords ( topRow - 1, + rightCol ) ); + } + + if ( oldRight > rightCol ) + { + need_refresh[2] = TRUE; + rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop, + rightCol + 1 ), + wxGridCellCoords ( oldBottom, + oldRight ) ); + } + + if ( oldBottom > bottomRow ) + { + need_refresh[3] = TRUE; + rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1, + leftCol ), + wxGridCellCoords ( oldBottom, + rightCol ) ); } + + + // Change Selection + m_selectingTopLeft = updateTopLeft; + m_selectingBottomRight = updateBottomRight; + + // various Refresh() calls + for (i = 0; i < 4; i++ ) + if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) + m_gridWin->Refresh( FALSE, &(rect[i]) ); } + + // never generate an event as it will be generated from + // wxGridSelection::SelectBlock! + // (old comment from when this was the body of SelectBlock) } @@ -3654,12 +5831,44 @@ void wxGrid::DrawGridCellArea( wxDC& dc ) } +void wxGrid::DrawGridSpace( wxDC& dc ) +{ + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); + + int right, bottom; + CalcUnscrolledPosition( cw, ch, &right, &bottom ); + + int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0; + int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ; + + if ( right > rightCol || bottom > bottomRow ) + { + int left, top; + CalcUnscrolledPosition( 0, 0, &left, &top ); + + dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) ); + dc.SetPen( *wxTRANSPARENT_PEN ); + + if ( right > rightCol ) + { + dc.DrawRectangle( rightCol, top, right - rightCol, ch); + } + + if ( bottom > bottomRow ) + { + dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow); + } + } +} + + void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) { int row = coords.GetRow(); int col = coords.GetCol(); - if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 ) + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) return; // we draw the cell border ourselves @@ -3668,69 +5877,131 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) DrawCellBorder( dc, coords ); #endif - // but all the rest is drawn by the cell renderer and hence may be - // customized - wxRect rect; - rect.x = m_colRights[col] - m_colWidths[col]; - rect.y = m_rowBottoms[row] - m_rowHeights[row]; - rect.width = m_colWidths[col]; - rect.height = m_rowHeights[row]; - wxGridCellAttr* attr = GetCellAttr(row, col); - attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords)); - attr->DecRef(); - if (m_currentCellCoords == coords) - DrawCellHighlight(dc); -} + bool isCurrent = coords == m_currentCellCoords; + wxRect rect = CellToRect( row, col ); + + // if the editor is shown, we should use it and not the renderer + // Note: However, only if it is really _shown_, i.e. not hidden! + if ( isCurrent && IsCellEditControlShown() ) + { + 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 + wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col); + renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords)); + renderer->DecRef(); + } + + attr->DecRef(); +} -void wxGrid::DrawCellHighlight( wxDC& dc ) +void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) { int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); - if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 ) + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) return; - wxRect rect; - rect.x = m_colRights[col] - m_colWidths[col]; - rect.y = m_rowBottoms[row] - m_rowHeights[row]; - rect.width = m_colWidths[col] - 1; - rect.height = m_rowHeights[row] - 1; + wxRect rect = CellToRect(row, col); - dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID)); + // 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); + +#if 0 + // VZ: my experiments with 3d borders... + + // how to properly set colours for arbitrary bg? + wxCoord x1 = rect.x, + y1 = rect.y, + x2 = rect.x + rect.width -1, + y2 = rect.y + rect.height -1; + + dc.SetPen(*wxWHITE_PEN); + dc.DrawLine(x1, y1, x2, y1); + dc.DrawLine(x1, y1, x1, y2); + + dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1); + dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 ); + + dc.SetPen(*wxBLACK_PEN); + dc.DrawLine(x1, y2, x2, y2); + dc.DrawLine(x2, y1, x2, y2+1); +#endif // 0 } + void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) { - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; - - dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); int row = coords.GetRow(); int col = coords.GetCol(); + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + return; + + dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); // right hand border // - dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row], - m_colRights[col], m_rowBottoms[row] ); + dc.DrawLine( GetColRight(col), GetRowTop(row), + GetColRight(col), GetRowBottom(row) ); // bottom border // - dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row], - m_colRights[col], m_rowBottoms[row] ); + dc.DrawLine( GetColLeft(col), GetRowBottom(row), + GetColRight(col), GetRowBottom(row) ); } +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 ( IsCellEditControlShown() ) + { + // don't show highlight when the edit control is shown + return; + } + + // 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(); + for ( size_t n = 0; n < count; n++ ) + { + if ( m_cellsExposed[n] == m_currentCellCoords ) + { + wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); + DrawCellHighlight(dc, attr); + attr->DecRef(); + + break; + } + } +} // TODO: remove this ??? // 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 || @@ -3738,7 +6009,9 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) int top, bottom, left, right; - if (reg.IsEmpty()){ +#if 0 //#ifndef __WXGTK__ + if (reg.IsEmpty()) + { int cw, ch; m_gridWin->GetClientSize(&cw, &ch); @@ -3747,17 +6020,24 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) CalcUnscrolledPosition( 0, 0, &left, &top ); CalcUnscrolledPosition( cw, ch, &right, &bottom ); } - else{ + else + { wxCoord x, y, w, h; reg.GetBox(x, y, w, h); CalcUnscrolledPosition( x, y, &left, &top ); CalcUnscrolledPosition( x + w, y + h, &right, &bottom ); } +#else + int cw, ch; + m_gridWin->GetClientSize(&cw, &ch); + CalcUnscrolledPosition( 0, 0, &left, &top ); + CalcUnscrolledPosition( cw, ch, &right, &bottom ); +#endif // avoid drawing grid lines past the last row and col // - right = wxMin( right, m_colRights[m_numCols-1] ); - bottom = wxMin( bottom, m_rowBottoms[m_numRows-1] ); + right = wxMin( right, GetColRight(m_numCols - 1) ); + bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) ); dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); @@ -3766,13 +6046,16 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) int i; for ( i = 0; i < m_numRows; i++ ) { - if ( m_rowBottoms[i]-1 > bottom ) + int bot = GetRowBottom(i) - 1; + + if ( bot > bottom ) { break; } - else if ( m_rowBottoms[i]-1 >= top ) + + if ( bot >= top ) { - dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 ); + dc.DrawLine( left, bot, right, bot ); } } @@ -3781,13 +6064,15 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) // for ( i = 0; i < m_numCols; i++ ) { - if ( m_colRights[i]-1 > right ) + int colRight = GetColRight(i) - 1; + if ( colRight > right ) { break; } - else if ( m_colRights[i]-1 >= left ) + + if ( colRight >= left ) { - dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom ); + dc.DrawLine( colRight, top, colRight, bottom ); } } } @@ -3795,7 +6080,7 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) void wxGrid::DrawRowLabels( wxDC& dc ) { - if ( !m_numRows || !m_numCols ) return; + if ( !m_numRows ) return; size_t i; size_t numLabels = m_rowLabelsExposed.GetCount(); @@ -3809,19 +6094,20 @@ void wxGrid::DrawRowLabels( wxDC& dc ) void wxGrid::DrawRowLabel( wxDC& dc, int row ) { - if ( m_rowHeights[row] <= 0 ) return; + if ( GetRowHeight(row) <= 0 ) + return; - int rowTop = m_rowBottoms[row] - m_rowHeights[row]; + int rowTop = GetRowTop(row), + rowBottom = GetRowBottom(row) - 1; dc.SetPen( *wxBLACK_PEN ); dc.DrawLine( m_rowLabelWidth-1, rowTop, - m_rowLabelWidth-1, m_rowBottoms[row]-1 ); + m_rowLabelWidth-1, rowBottom ); - dc.DrawLine( 0, m_rowBottoms[row]-1, - m_rowLabelWidth-1, m_rowBottoms[row]-1 ); + dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom ); dc.SetPen( *wxWHITE_PEN ); - dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 ); + dc.DrawLine( 0, rowTop, 0, rowBottom ); dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop ); dc.SetBackgroundMode( wxTRANSPARENT ); @@ -3833,16 +6119,16 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row ) wxRect rect; rect.SetX( 2 ); - rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 ); + rect.SetY( GetRowTop(row) + 2 ); rect.SetWidth( m_rowLabelWidth - 4 ); - rect.SetHeight( m_rowHeights[row] - 4 ); + rect.SetHeight( GetRowHeight(row) - 4 ); DrawTextRectangle( dc, GetRowLabelValue( row ), rect, hAlign, vAlign ); } void wxGrid::DrawColLabels( wxDC& dc ) { - if ( !m_numRows || !m_numCols ) return; + if ( !m_numCols ) return; size_t i; size_t numLabels = m_colLabelsExposed.GetCount(); @@ -3856,20 +6142,22 @@ void wxGrid::DrawColLabels( wxDC& dc ) void wxGrid::DrawColLabel( wxDC& dc, int col ) { - if ( m_colWidths[col] <= 0 ) return; + if ( GetColWidth(col) <= 0 ) + return; - int colLeft = m_colRights[col] - m_colWidths[col]; + int colLeft = GetColLeft(col), + colRight = GetColRight(col) - 1; dc.SetPen( *wxBLACK_PEN ); - dc.DrawLine( m_colRights[col]-1, 0, - m_colRights[col]-1, m_colLabelHeight-1 ); + dc.DrawLine( colRight, 0, + colRight, m_colLabelHeight-1 ); dc.DrawLine( colLeft, m_colLabelHeight-1, - m_colRights[col]-1, m_colLabelHeight-1 ); + colRight, m_colLabelHeight-1 ); dc.SetPen( *wxWHITE_PEN ); dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 ); - dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 ); + dc.DrawLine( colLeft, 0, colRight, 0 ); dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); @@ -3883,9 +6171,9 @@ void wxGrid::DrawColLabel( wxDC& dc, int col ) GetColLabelAlignment( &hAlign, &vAlign ); wxRect rect; - rect.SetX( m_colRights[col] - m_colWidths[col] + 2 ); + rect.SetX( colLeft + 2 ); rect.SetY( 2 ); - rect.SetWidth( m_colWidths[col] - 4 ); + rect.SetWidth( GetColWidth(col) - 4 ); rect.SetHeight( m_colLabelHeight - 4 ); DrawTextRectangle( dc, GetColLabelValue( col ), rect, hAlign, vAlign ); } @@ -3911,15 +6199,15 @@ void wxGrid::DrawTextRectangle( wxDC& dc, float x, y; switch ( horizAlign ) { - case wxRIGHT: + case wxALIGN_RIGHT: x = rect.x + (rect.width - textWidth - 1); break; - case wxCENTRE: + case wxALIGN_CENTRE: x = rect.x + ((rect.width - textWidth)/2); break; - case wxLEFT: + case wxALIGN_LEFT: default: x = rect.x + 1; break; @@ -3927,15 +6215,15 @@ void wxGrid::DrawTextRectangle( wxDC& dc, switch ( vertAlign ) { - case wxBOTTOM: + case wxALIGN_BOTTOM: y = rect.y + (rect.height - textHeight - 1); break; - case wxCENTRE: + case wxALIGN_CENTRE: y = rect.y + ((rect.height - textHeight)/2); break; - case wxTOP: + case wxALIGN_TOP: default: y = rect.y + 1; break; @@ -3943,7 +6231,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; } } @@ -4006,6 +6294,35 @@ void wxGrid::GetTextBoxSize( wxDC& dc, *height = h; } +// +// ------ Batch processing. +// +void wxGrid::EndBatch() +{ + if ( m_batchCount > 0 ) + { + m_batchCount--; + if ( !m_batchCount ) + { + CalcDimensions(); + m_rowLabelWin->Refresh(); + m_colLabelWin->Refresh(); + m_cornerLabelWin->Refresh(); + m_gridWin->Refresh(); + } + } +} + +// Use this, rather than wxWindow::Refresh(), to force an immediate +// repainting of the grid. Has no effect if you are already inside a +// BeginBatch / EndBatch block. +// +void wxGrid::ForceRefresh() +{ + BeginBatch(); + EndBatch(); +} + // // ------ Edit control functions @@ -4018,9 +6335,8 @@ void wxGrid::EnableEditing( bool edit ) // if ( edit != m_editable ) { + if(!edit) EnableCellEditControl(edit); m_editable = edit; - - EnableCellEditControl(m_editable); } } @@ -4035,21 +6351,78 @@ 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 ) { + // this should be checked by the caller! + wxASSERT_MSG( CanEnableCellControl(), + _T("can't enable editing for this cell!") ); + + // do it before ShowCellEditControl() m_cellEditCtrlEnabled = enable; - SetEditControlValue(); + ShowCellEditControl(); } else { - HideCellEditControl(); - SaveEditControlValue(); - m_cellEditCtrlEnabled = enable; + HideCellEditControl(); + SaveEditControlValue(); + + // do it after HideCellEditControl() + m_cellEditCtrlEnabled = enable; + } + } +} + +bool wxGrid::IsCurrentCellReadOnly() const +{ + // const_cast + wxGridCellAttr* attr = ((wxGrid *)this)->GetCellAttr(m_currentCellCoords); + bool readonly = attr->IsReadOnly(); + attr->DecRef(); + + return readonly; +} + +bool wxGrid::CanEnableCellControl() const +{ + return m_editable && !IsCurrentCellReadOnly(); +} + +bool wxGrid::IsCellEditControlEnabled() const +{ + // the cell edit control might be disable for all cells or just for the + // current one if it's read only + return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE; +} + +bool wxGrid::IsCellEditControlShown() const +{ + bool isShown = FALSE; + + if ( m_cellEditCtrlEnabled ) + { + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor((wxGrid*) this, row, col); + attr->DecRef(); + + if ( editor ) + { + if ( editor->IsCreated() ) + { + isShown = editor->GetControl()->IsShown(); + } + + editor->DecRef(); } } -} + return isShown; +} void wxGrid::ShowCellEditControl() { @@ -4057,6 +6430,7 @@ void wxGrid::ShowCellEditControl() { if ( !IsVisible( m_currentCellCoords ) ) { + m_cellEditCtrlEnabled = FALSE; return; } else @@ -4067,63 +6441,38 @@ void wxGrid::ShowCellEditControl() // convert to scrolled coords // - int left, top, right, bottom; - CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top ); - CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom ); - left--; top--; right--; bottom--; // cell is shifted by one pixel - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - // Make the edit control large enough to allow for internal margins - // TODO: remove this if the text ctrl sizing is improved esp. for unix - // - int extra; -#if defined(__WXMOTIF__) - if ( row == 0 || col == 0 ) - { - extra = 2; - } - else - { - extra = 4; - } -#else - if ( row == 0 || col == 0 ) - { - extra = 1; - } - else - { - extra = 2; - } -#endif + // done in PaintBackground() +#if 0 + // erase the highlight and the cell contents because the editor + // might not cover the entire cell + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID)); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.DrawRectangle(rect); +#endif // 0 -#if defined(__WXGTK__) - int top_diff = 0; - int left_diff = 0; - if (left != 0) left_diff++; - if (top != 0) top_diff++; - rect.SetLeft( left + left_diff ); - rect.SetTop( top + top_diff ); - rect.SetRight( rect.GetRight() - left_diff ); - rect.SetBottom( rect.GetBottom() - top_diff ); -#else - rect.SetLeft( wxMax(0, left - extra) ); - rect.SetTop( wxMax(0, top - extra) ); - rect.SetRight( rect.GetRight() + 2*extra ); - rect.SetBottom( rect.GetBottom() + 2*extra ); -#endif + // cell is shifted by one pixel + rect.x--; + rect.y--; - wxGridCellAttr* attr = GetCellAttr(row, col); - wxGridCellEditor* editor = attr->GetEditor(); - if (! editor->IsCreated()) { + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(this, row, col); + if ( !editor->IsCreated() ) + { editor->Create(m_gridWin, -1, new wxGridCellEditorEvtHandler(this, editor)); } + editor->Show( TRUE, attr ); + editor->SetSize( rect ); - editor->Show( TRUE ); - editor->BeginEdit(row, col, this, attr); + + editor->BeginEdit(row, col, this); + + editor->DecRef(); attr->DecRef(); } } @@ -4137,34 +6486,35 @@ void wxGrid::HideCellEditControl() int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); - wxGridCellAttr* attr = GetCellAttr(row, col); - attr->GetEditor()->Show( FALSE ); + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor *editor = attr->GetEditor(this, row, col); + editor->Show( FALSE ); + editor->DecRef(); attr->DecRef(); m_gridWin->SetFocus(); + wxRect rect( CellToRect( row, col ) ); + m_gridWin->Refresh( FALSE, &rect ); } } -void wxGrid::SetEditControlValue( const wxString& value ) -{ - // RD: The new Editors get the value from the table themselves now. This - // method can probably be removed... -} - - void wxGrid::SaveEditControlValue() { - if (IsCellEditControlEnabled()) { + if ( IsCellEditControlEnabled() ) + { int row = m_currentCellCoords.GetRow(); int col = m_currentCellCoords.GetCol(); - wxGridCellAttr* attr = GetCellAttr(row, col); - bool changed = attr->GetEditor()->EndEdit(row, col, TRUE, this, attr); + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(this, row, col); + bool changed = editor->EndEdit(row, col, this); + editor->DecRef(); attr->DecRef(); - if (changed) { - SendEvent( EVT_GRID_CELL_CHANGE, + if (changed) + { + SendEvent( wxEVT_GRID_CELL_CHANGE, m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol() ); } @@ -4201,10 +6551,11 @@ int wxGrid::YToRow( int y ) for ( i = 0; i < m_numRows; i++ ) { - if ( y < m_rowBottoms[i] ) return i; + if ( y < GetRowBottom(i) ) + return i; } - return m_numRows; //-1; + return -1; } @@ -4214,10 +6565,11 @@ int wxGrid::XToCol( int x ) for ( i = 0; i < m_numCols; i++ ) { - if ( x < m_colRights[i] ) return i; + if ( x < GetColRight(i) ) + return i; } - return m_numCols; //-1; + return -1; } @@ -4230,12 +6582,11 @@ int wxGrid::YToEdgeOfRow( int y ) for ( i = 0; i < m_numRows; i++ ) { - if ( m_rowHeights[i] > WXGRID_LABEL_EDGE_ZONE ) + if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE ) { - d = abs( y - m_rowBottoms[i] ); - { - if ( d < WXGRID_LABEL_EDGE_ZONE ) return i; - } + d = abs( y - GetRowBottom(i) ); + if ( d < WXGRID_LABEL_EDGE_ZONE ) + return i; } } @@ -4252,12 +6603,11 @@ int wxGrid::XToEdgeOfCol( int x ) for ( i = 0; i < m_numCols; i++ ) { - if ( m_colWidths[i] > WXGRID_LABEL_EDGE_ZONE ) + if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE ) { - d = abs( x - m_colRights[i] ); - { - if ( d < WXGRID_LABEL_EDGE_ZONE ) return i; - } + d = abs( x - GetColRight(i) ); + if ( d < WXGRID_LABEL_EDGE_ZONE ) + return i; } } @@ -4272,12 +6622,17 @@ wxRect wxGrid::CellToRect( int row, int col ) if ( row >= 0 && row < m_numRows && col >= 0 && col < m_numCols ) { - rect.x = m_colRights[col] - m_colWidths[col]; - rect.y = m_rowBottoms[row] - m_rowHeights[row]; - rect.width = m_colWidths[col]; - rect.height = m_rowHeights[ row ]; + rect.x = GetColLeft(col); + rect.y = GetRowTop(row); + rect.width = GetColWidth(col); + rect.height = GetRowHeight(row); } + // if grid lines are enabled, then the area of the cell is a bit smaller + if (m_gridLinesEnabled) { + rect.width -= 1; + rect.height -= 1; + } return rect; } @@ -4350,10 +6705,12 @@ void wxGrid::MakeCellVisible( int row, int col ) ypos = r.GetTop(); for ( i = row-1; i >= 0; i-- ) { - if ( h + m_rowHeights[i] > ch ) break; + int rowHeight = GetRowHeight(i); + if ( h + rowHeight > ch ) + break; - h += m_rowHeights[i]; - ypos -= m_rowHeights[i]; + h += rowHeight; + ypos -= rowHeight; } // we divide it later by GRID_SCROLL_LINE, make sure that we don't @@ -4372,10 +6729,12 @@ void wxGrid::MakeCellVisible( int row, int col ) xpos = r.GetLeft(); for ( i = col-1; i >= 0; i-- ) { - if ( w + m_colWidths[i] > cw ) break; + int colWidth = GetColWidth(i); + if ( w + colWidth > cw ) + break; - w += m_colWidths[i]; - xpos -= m_colWidths[i]; + w += colWidth; + xpos -= colWidth; } // see comment for ypos above @@ -4397,17 +6756,33 @@ 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 ) + 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; + if ( m_selectingKeyboard.GetRow() > 0 ) + { + m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() - 1 ); + MakeCellVisible( m_selectingKeyboard.GetRow(), + m_selectingKeyboard.GetCol() ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); + } + } + else if ( m_currentCellCoords.GetRow() > 0 ) + { + ClearSelection(); + MakeCellVisible( m_currentCellCoords.GetRow() - 1, + m_currentCellCoords.GetCol() ); + SetCurrentCell( m_currentCellCoords.GetRow() - 1, + m_currentCellCoords.GetCol() ); + } + else + return FALSE; return TRUE; } @@ -4415,19 +6790,33 @@ 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 ) + m_currentCellCoords.GetRow() < m_numRows ) { - 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; + if ( m_selectingKeyboard.GetRow() < m_numRows-1 ) + { + m_selectingKeyboard.SetRow( m_selectingKeyboard.GetRow() + 1 ); + MakeCellVisible( m_selectingKeyboard.GetRow(), + m_selectingKeyboard.GetCol() ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); + } + } + else if ( m_currentCellCoords.GetRow() < m_numRows - 1 ) + { + ClearSelection(); + MakeCellVisible( m_currentCellCoords.GetRow() + 1, + m_currentCellCoords.GetCol() ); + SetCurrentCell( m_currentCellCoords.GetRow() + 1, + m_currentCellCoords.GetCol() ); + } + else + return FALSE; return TRUE; } @@ -4435,17 +6824,33 @@ bool wxGrid::MoveCursorDown() } -bool wxGrid::MoveCursorLeft() +bool wxGrid::MoveCursorLeft( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetCol() > 0 ) + 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; + if ( m_selectingKeyboard.GetCol() > 0 ) + { + m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() - 1 ); + MakeCellVisible( m_selectingKeyboard.GetRow(), + m_selectingKeyboard.GetCol() ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); + } + } + else if ( m_currentCellCoords.GetCol() > 0 ) + { + ClearSelection(); + MakeCellVisible( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() - 1 ); + SetCurrentCell( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() - 1 ); + } + else + return FALSE; return TRUE; } @@ -4453,17 +6858,33 @@ bool wxGrid::MoveCursorLeft() } -bool wxGrid::MoveCursorRight() +bool wxGrid::MoveCursorRight( bool expandSelection ) { if ( m_currentCellCoords != wxGridNoCellCoords && - m_currentCellCoords.GetCol() < m_numCols - 1 ) + m_currentCellCoords.GetCol() < m_numCols ) { - 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; + if ( m_selectingKeyboard.GetCol() < m_numCols - 1 ) + { + m_selectingKeyboard.SetCol( m_selectingKeyboard.GetCol() + 1 ); + MakeCellVisible( m_selectingKeyboard.GetRow(), + m_selectingKeyboard.GetCol() ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); + } + } + else if ( m_currentCellCoords.GetCol() < m_numCols - 1 ) + { + ClearSelection(); + MakeCellVisible( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() + 1 ); + SetCurrentCell( m_currentCellCoords.GetRow(), + m_currentCellCoords.GetCol() + 1 ); + } + else + return FALSE; return TRUE; } @@ -4481,7 +6902,7 @@ bool wxGrid::MovePageUp() int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); - int y = m_rowBottoms[ row ] - m_rowHeights[ row ]; + int y = GetRowTop(row); int newRow = YToRow( y - ch + 1 ); if ( newRow == -1 ) { @@ -4511,7 +6932,7 @@ bool wxGrid::MovePageDown() int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); - int y = m_rowBottoms[ row ] - m_rowHeights[ row ]; + int y = GetRowTop(row); int newRow = YToRow( y + ch ); if ( newRow == -1 ) { @@ -4531,7 +6952,7 @@ bool wxGrid::MovePageDown() return FALSE; } -bool wxGrid::MoveCursorUpBlock() +bool wxGrid::MoveCursorUpBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -4578,15 +6999,23 @@ bool wxGrid::MoveCursorUpBlock() } MakeCellVisible( row, col ); - SetCurrentCell( row, col ); - + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + HighlightBlock( 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 && @@ -4633,7 +7062,16 @@ bool wxGrid::MoveCursorDownBlock() } MakeCellVisible( row, col ); - SetCurrentCell( row, col ); + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + SetCurrentCell( row, col ); + } return TRUE; } @@ -4641,7 +7079,7 @@ bool wxGrid::MoveCursorDownBlock() return FALSE; } -bool wxGrid::MoveCursorLeftBlock() +bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -4688,7 +7126,16 @@ bool wxGrid::MoveCursorLeftBlock() } MakeCellVisible( row, col ); - SetCurrentCell( row, col ); + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + SetCurrentCell( row, col ); + } return TRUE; } @@ -4696,7 +7143,7 @@ bool wxGrid::MoveCursorLeftBlock() return FALSE; } -bool wxGrid::MoveCursorRightBlock() +bool wxGrid::MoveCursorRightBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -4743,7 +7190,16 @@ bool wxGrid::MoveCursorRightBlock() } MakeCellVisible( row, col ); - SetCurrentCell( row, col ); + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + SetCurrentCell( row, col ); + } return TRUE; } @@ -4887,12 +7343,27 @@ void wxGrid::SetLabelFont( const wxFont& font ) void wxGrid::SetRowLabelAlignment( int horiz, int vert ) { - if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT ) + // allow old (incorrect) defs to be used + switch ( horiz ) + { + case wxLEFT: horiz = wxALIGN_LEFT; break; + 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; } - if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM ) + if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM ) { m_rowLabelVertAlign = vert; } @@ -4905,12 +7376,27 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert ) void wxGrid::SetColLabelAlignment( int horiz, int vert ) { - if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT ) + // allow old (incorrect) defs to be used + switch ( horiz ) + { + case wxLEFT: horiz = wxALIGN_LEFT; break; + 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; } - if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM ) + if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM ) { m_colLabelVertAlign = vert; } @@ -4932,7 +7418,7 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s ) if ( rect.height > 0 ) { CalcScrolledPosition(0, rect.y, &rect.x, &rect.y); - rect.x = m_left; + rect.x = 0; rect.width = m_rowLabelWidth; m_rowLabelWin->Refresh( TRUE, &rect ); } @@ -4951,7 +7437,7 @@ void wxGrid::SetColLabelValue( int col, const wxString& s ) if ( rect.width > 0 ) { CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y); - rect.y = m_top; + rect.y = 0; rect.height = m_colLabelHeight; m_colLabelWin->Refresh( TRUE, &rect ); } @@ -4971,6 +7457,21 @@ void wxGrid::SetGridLineColour( const wxColour& colour ) } } + +void wxGrid::SetCellHighlightColour( const wxColour& colour ) +{ + if ( m_cellHighlightColour != colour ) + { + m_cellHighlightColour = colour; + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords); + DrawCellHighlight(dc, attr); + attr->DecRef(); + } +} + void wxGrid::EnableGridLines( bool enable ) { if ( enable != m_gridLinesEnabled ) @@ -5003,7 +7504,7 @@ int wxGrid::GetRowSize( int row ) { wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") ); - return m_rowHeights[row]; + return GetRowHeight(row); } int wxGrid::GetDefaultColSize() @@ -5015,7 +7516,7 @@ int wxGrid::GetColSize( int col ) { wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") ); - return m_colWidths[col]; + return GetColWidth(col); } // ============================================================================ @@ -5030,6 +7531,9 @@ int wxGrid::GetColSize( int col ) void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col ) { m_defaultCellAttr->SetBackgroundColour(col); +#ifdef __WXGTK__ + m_gridWin->SetBackgroundColour(col); +#endif } void wxGrid::SetDefaultCellTextColour( const wxColour& col ) @@ -5052,6 +7556,11 @@ void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) m_defaultCellAttr->SetRenderer(renderer); } +void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) +{ + m_defaultCellAttr->SetEditor(editor); +} + // ---------------------------------------------------------------------------- // access to the default attrbiutes // ---------------------------------------------------------------------------- @@ -5078,7 +7587,12 @@ void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) wxGridCellRenderer *wxGrid::GetDefaultRenderer() const { - return m_defaultCellAttr->GetRenderer(); + return m_defaultCellAttr->GetRenderer(NULL, 0, 0); +} + +wxGridCellEditor *wxGrid::GetDefaultEditor() const +{ + return m_defaultCellAttr->GetEditor(NULL,0,0); } // ---------------------------------------------------------------------------- @@ -5089,7 +7603,7 @@ wxColour wxGrid::GetCellBackgroundColour(int row, int col) { wxGridCellAttr *attr = GetCellAttr(row, col); wxColour colour = attr->GetBackgroundColour(); - attr->SafeDecRef(); + attr->DecRef(); return colour; } @@ -5097,7 +7611,7 @@ wxColour wxGrid::GetCellTextColour( int row, int col ) { wxGridCellAttr *attr = GetCellAttr(row, col); wxColour colour = attr->GetTextColour(); - attr->SafeDecRef(); + attr->DecRef(); return colour; } @@ -5105,7 +7619,7 @@ wxFont wxGrid::GetCellFont( int row, int col ) { wxGridCellAttr *attr = GetCellAttr(row, col); wxFont font = attr->GetFont(); - attr->SafeDecRef(); + attr->DecRef(); return font; } @@ -5113,17 +7627,35 @@ 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) { wxGridCellAttr* attr = GetCellAttr(row, col); - wxGridCellRenderer* renderer = attr->GetRenderer(); + wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); attr->DecRef(); + return renderer; } +wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(this, row, col); + attr->DecRef(); + + return editor; +} + +bool wxGrid::IsReadOnly(int row, int col) const +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + bool isReadOnly = attr->IsReadOnly(); + attr->DecRef(); + return isReadOnly; +} + // ---------------------------------------------------------------------------- // attribute support: cache, automatic provider creation, ... // ---------------------------------------------------------------------------- @@ -5135,26 +7667,14 @@ bool wxGrid::CanHaveAttributes() return FALSE; } - // RD: Maybe m_table->CanHaveAttributes() would be better in case the - // table is providing the attributes itself??? In which case - // I don't think the grid should create a Provider object for the - // table but the table should be smart enough to do that on its own. - if ( !m_table->GetAttrProvider() ) - { - // use the default attr provider by default - // (another choice would be to just return FALSE thus forcing the user - // to it himself) - m_table->SetAttrProvider(new wxGridCellAttrProvider); - } - - return TRUE; + return m_table->CanHaveAttributes(); } void wxGrid::ClearAttrCache() { if ( m_attrCache.row != -1 ) { - m_attrCache.attr->SafeDecRef(); + wxSafeDecRef(m_attrCache.attr); m_attrCache.row = -1; } } @@ -5167,7 +7687,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 @@ -5175,7 +7695,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++; @@ -5200,9 +7720,12 @@ wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL; CacheAttr(row, col, attr); } - if (attr) { + if (attr) + { attr->SetDefAttr(m_defaultCellAttr); - } else { + } + else + { attr = m_defaultCellAttr; attr->IncRef(); } @@ -5216,8 +7739,7 @@ wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const 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") ); + _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 ) @@ -5236,6 +7758,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 // ---------------------------------------------------------------------------- @@ -5248,7 +7804,7 @@ void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) } else { - attr->SafeDecRef(); + wxSafeDecRef(attr); } } @@ -5260,7 +7816,7 @@ void wxGrid::SetColAttr(int col, wxGridCellAttr *attr) } else { - attr->SafeDecRef(); + wxSafeDecRef(attr); } } @@ -5314,24 +7870,108 @@ void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) } } +void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetEditor(editor); + attr->DecRef(); + } +} + +void wxGrid::SetReadOnly(int row, int col, bool isReadOnly) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetReadOnly(isReadOnly); + attr->DecRef(); + } +} + +// ---------------------------------------------------------------------------- +// Data type registration +// ---------------------------------------------------------------------------- + +void wxGrid::RegisterDataType(const wxString& typeName, + wxGridCellRenderer* renderer, + wxGridCellEditor* editor) +{ + m_typeRegistry->RegisterDataType(typeName, renderer, editor); +} + + +wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const +{ + wxString typeName = m_table->GetTypeName(row, col); + return GetDefaultEditorForType(typeName); +} + +wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const +{ + wxString typeName = m_table->GetTypeName(row, col); + return GetDefaultRendererForType(typeName); +} + +wxGridCellEditor* +wxGrid::GetDefaultEditorForType(const wxString& typeName) const +{ + 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->FindOrCloneDataType(typeName); + if ( index == wxNOT_FOUND ) + { + wxFAIL_MSG(wxT("Unknown data type name")); + + return NULL; + } + + return m_typeRegistry->GetRenderer(index); +} + + // ---------------------------------------------------------------------------- // row/col size // ---------------------------------------------------------------------------- +void wxGrid::EnableDragRowSize( bool enable ) +{ + m_canDragRowSize = enable; +} + + +void wxGrid::EnableDragColSize( bool enable ) +{ + m_canDragColSize = enable; +} + +void wxGrid::EnableDragGridSize( bool enable ) +{ + m_canDragGridSize = enable; +} + + void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows ) { m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT ); if ( resizeExistingRows ) { - int row; - int bottom = 0; - for ( row = 0; row < m_numRows; row++ ) - { - m_rowHeights[row] = m_defaultRowHeight; - bottom += m_defaultRowHeight; - m_rowBottoms[row] = bottom; - } + InitRowHeights(); + CalcDimensions(); } } @@ -5340,12 +7980,17 @@ void wxGrid::SetRowSize( int row, int height ) { wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") ); - int i; + if ( m_rowHeights.IsEmpty() ) + { + // need to really create the array + InitRowHeights(); + } int h = wxMax( 0, height ); int diff = h - m_rowHeights[row]; m_rowHeights[row] = h; + int i; for ( i = row; i < m_numRows; i++ ) { m_rowBottoms[i] += diff; @@ -5359,14 +8004,8 @@ void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) if ( resizeExistingCols ) { - int col; - int right = 0; - for ( col = 0; col < m_numCols; col++ ) - { - m_colWidths[col] = m_defaultColWidth; - right += m_defaultColWidth; - m_colRights[col] = right; - } + InitColWidths(); + CalcDimensions(); } } @@ -5375,12 +8014,19 @@ void wxGrid::SetColSize( int col, int width ) { wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") ); - int i; + // should we check that it's bigger than GetColMinimalWidth(col) here? + + if ( m_colWidths.IsEmpty() ) + { + // need to really create the array + InitColWidths(); + } int w = wxMax( 0, width ); int diff = w - m_colWidths[col]; m_colWidths[col] = w; + int i; for ( i = col; i < m_numCols; i++ ) { m_colRights[i] += diff; @@ -5389,339 +8035,267 @@ void wxGrid::SetColSize( int col, int width ) } -// -// ------ cell value accessor functions -// - -void wxGrid::SetCellValue( int row, int col, const wxString& s ) +void wxGrid::SetColMinimalWidth( int col, int width ) { - if ( m_table ) - { - m_table->SetValue( row, col, s.c_str() ); - if ( !GetBatchCount() ) - { - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - DrawCell( dc, wxGridCellCoords(row, col) ); - } - -#if 0 // TODO: edit in place + m_colMinWidths.Put(col, width); +} - if ( m_currentCellCoords.GetRow() == row && - m_currentCellCoords.GetCol() == col ) - { - SetEditControlValue( s ); - } -#endif +void wxGrid::SetRowMinimalHeight( int row, int width ) +{ + m_rowMinHeights.Put(row, width); +} - } +int wxGrid::GetColMinimalWidth(int col) const +{ + 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; +} -// -// ------ Block, row and col selection -// +// ---------------------------------------------------------------------------- +// auto sizing +// ---------------------------------------------------------------------------- -void wxGrid::SelectRow( int row, bool addToSelected ) +void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) { - wxRect r; + wxClientDC dc(m_gridWin); - if ( IsSelection() && addToSelected ) - { - wxRect rect[4]; - bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE }; - int i; + // 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 oldLeft = m_selectedTopLeft.GetCol(); - wxCoord oldTop = m_selectedTopLeft.GetRow(); - wxCoord oldRight = m_selectedBottomRight.GetCol(); - wxCoord oldBottom = m_selectedBottomRight.GetRow(); + 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; - if ( oldTop > row ) + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); + if ( renderer ) { - need_refresh[0] = TRUE; - rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ), - wxGridCellCoords ( oldTop - 1, - m_numCols - 1 ) ); - m_selectedTopLeft.SetRow( row ); + wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col); + extent = column ? size.x : size.y; + if ( extent > extentMax ) + { + extentMax = extent; + } + + renderer->DecRef(); } - if ( oldLeft > 0 ) - { - need_refresh[1] = TRUE; - rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ), - wxGridCellCoords ( oldBottom, - oldLeft - 1 ) ); + attr->DecRef(); + } - m_selectedTopLeft.SetCol( 0 ); - } + // now also compare with the column label extent + wxCoord w, h; + dc.SetFont( GetLabelFont() ); - if ( oldBottom < row ) - { - need_refresh[2] = TRUE; - rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ), - wxGridCellCoords ( row, - m_numCols - 1 ) ); - m_selectedBottomRight.SetRow( row ); - } + if ( column ) + dc.GetTextExtent( GetColLabelValue(col), &w, &h ); + else + dc.GetTextExtent( GetRowLabelValue(col), &w, &h ); - 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 ); - } + extent = column ? w : h; + if ( extent > extentMax ) + { + extentMax = extent; + } - for (i = 0; i < 4; i++ ) - if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( FALSE, &(rect[i]) ); + if ( !extentMax ) + { + // 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 { - r = SelectionToDeviceRect(); - 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 ); + if ( column ) + { + // leave some space around text + extentMax += 10; + } + else + { + extentMax += 6; + } } - wxGridRangeSelectEvent gridEvt( GetId(), - EVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); + if ( column ) + SetColSize(col, extentMax); + else + SetRowSize(row, extentMax); - GetEventHandler()->ProcessEvent(gridEvt); + if ( setAsMin ) + { + if ( column ) + SetColMinimalWidth(col, extentMax); + else + SetRowMinimalHeight(row, extentMax); + } } - -void wxGrid::SelectCol( int col, bool addToSelected ) +int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) { - if ( IsSelection() && addToSelected ) - { - wxRect rect[4]; - bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE }; - int i; + int width = m_rowLabelWidth; - wxCoord oldLeft = m_selectedTopLeft.GetCol(); - wxCoord oldTop = m_selectedTopLeft.GetRow(); - wxCoord oldRight = m_selectedBottomRight.GetCol(); - wxCoord oldBottom = m_selectedBottomRight.GetRow(); - - if ( oldLeft > col ) + for ( int col = 0; col < m_numCols; col++ ) + { + if ( !calcOnly ) { - need_refresh[0] = TRUE; - rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ), - wxGridCellCoords ( m_numRows - 1, - oldLeft - 1 ) ); - m_selectedTopLeft.SetCol( col ); + AutoSizeColumn(col, setAsMin); } - if ( oldTop > 0 ) - { - need_refresh[1] = TRUE; - rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ), - wxGridCellCoords ( oldTop - 1, - oldRight ) ); - m_selectedTopLeft.SetRow( 0 ); - } + width += GetColWidth(col); + } - if ( oldRight < col ) - { - need_refresh[2] = TRUE; - rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ), - wxGridCellCoords ( m_numRows - 1, - col ) ); - m_selectedBottomRight.SetCol( col ); - } + return width; +} + +int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) +{ + int height = m_colLabelHeight; - if ( oldBottom < m_numRows - 1 ) + for ( int row = 0; row < m_numRows; row++ ) + { + if ( !calcOnly ) { - need_refresh[3] = TRUE; - rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, - oldLeft ), - wxGridCellCoords ( m_numRows - 1, - oldRight ) ); - m_selectedBottomRight.SetRow( m_numRows - 1 ); + AutoSizeRow(row, setAsMin); } - for (i = 0; i < 4; i++ ) - if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - m_gridWin->Refresh( FALSE, &(rect[i]) ); + height += GetRowHeight(row); } - else - { - wxRect r; - r = SelectionToDeviceRect(); - ClearSelection(); - if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r ); + return height; +} - m_selectedTopLeft.Set( 0, col ); - m_selectedBottomRight.Set( m_numRows-1, col ); - r = SelectionToDeviceRect(); - m_gridWin->Refresh( FALSE, &r ); - } +void wxGrid::AutoSize() +{ + // set the size too + SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE)); +} - wxGridRangeSelectEvent gridEvt( GetId(), - EVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); +wxSize wxGrid::DoGetBestSize() const +{ + // don't set sizes, only calculate them + wxGrid *self = (wxGrid *)this; // const_cast - GetEventHandler()->ProcessEvent(gridEvt); + return wxSize(self->SetOrCalcColumnSizes(TRUE), + self->SetOrCalcRowSizes(TRUE)); } - -void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) +void wxGrid::Fit() { - int temp; - wxGridCellCoords updateTopLeft, updateBottomRight; + AutoSize(); +} - if ( topRow > bottomRow ) - { - temp = topRow; - topRow = bottomRow; - bottomRow = temp; - } - if ( leftCol > rightCol ) - { - temp = leftCol; - leftCol = rightCol; - rightCol = temp; - } +wxPen& wxGrid::GetDividerPen() const +{ + return wxNullPen; +} - updateTopLeft = wxGridCellCoords( topRow, leftCol ); - updateBottomRight = wxGridCellCoords( bottomRow, rightCol ); +// ---------------------------------------------------------------------------- +// cell value accessor functions +// ---------------------------------------------------------------------------- - if ( m_selectedTopLeft != updateTopLeft || - m_selectedBottomRight != updateBottomRight ) +void wxGrid::SetCellValue( int row, int col, const wxString& s ) +{ + if ( m_table ) { - // Compute two optimal update rectangles: - // Either one rectangle is a real subset of the - // other, or they are (almost) disjoint! - wxRect rect[4]; - bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE }; - 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(); - - // Determine the outer/inner coordinates. - if (oldLeft > leftCol) - { - temp = oldLeft; - oldLeft = leftCol; - leftCol = temp; - } - if (oldTop > topRow ) - { - temp = oldTop; - oldTop = topRow; - topRow = temp; - } - if (oldRight < rightCol ) + m_table->SetValue( row, col, s ); + if ( !GetBatchCount() ) { - temp = oldRight; - oldRight = rightCol; - rightCol = temp; + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + DrawCell( dc, wxGridCellCoords(row, col) ); } - if (oldBottom < bottomRow) + + if ( m_currentCellCoords.GetRow() == row && + m_currentCellCoords.GetCol() == col && + IsCellEditControlShown()) + // Note: If we are using IsCellEditControlEnabled, + // this interacts badly with calling SetCellValue from + // an EVT_GRID_CELL_CHANGE handler. { - temp = oldBottom; - oldBottom = bottomRow; - bottomRow = temp; + HideCellEditControl(); + ShowCellEditControl(); // will reread data from table } + } +} - // Now, either the stuff marked old is the outer - // rectangle or we don't have a situation where one - // is contained in the other. - if ( oldLeft < leftCol ) - { - need_refresh[0] = TRUE; - rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - oldLeft ), - wxGridCellCoords ( oldBottom, - leftCol - 1 ) ); - } +// +// ------ Block, row and col selection +// - if ( oldTop < topRow ) - { - need_refresh[1] = TRUE; - rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - leftCol ), - wxGridCellCoords ( topRow - 1, - rightCol ) ); - } +void wxGrid::SelectRow( int row, bool addToSelected ) +{ + if ( IsSelection() && !addToSelected ) + ClearSelection(); - if ( oldRight > rightCol ) - { - need_refresh[2] = TRUE; - rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop, - rightCol + 1 ), - wxGridCellCoords ( oldBottom, - oldRight ) ); - } + m_selection->SelectRow( row, FALSE, addToSelected ); +} - if ( oldBottom > bottomRow ) - { - need_refresh[3] = TRUE; - rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1, - leftCol ), - wxGridCellCoords ( oldBottom, - rightCol ) ); - } +void wxGrid::SelectCol( int col, bool addToSelected ) +{ + if ( IsSelection() && !addToSelected ) + ClearSelection(); - // Change Selection - m_selectedTopLeft = updateTopLeft; - m_selectedBottomRight = updateBottomRight; + m_selection->SelectCol( col, FALSE, addToSelected ); +} - // various Refresh() calls - for (i = 0; i < 4; i++ ) - if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) - 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(), - EVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); +void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, + bool addToSelected ) +{ + if ( IsSelection() && !addToSelected ) + ClearSelection(); - GetEventHandler()->ProcessEvent(gridEvt); - } + m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol, + FALSE, addToSelected ); } + 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(); } @@ -5763,6 +8337,9 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, int cw, ch; m_gridWin->GetClientSize( &cw, &ch ); + if (right < 0 || bottom < 0 || left > cw || top > ch) + return wxRect( 0, 0, 0, 0); + rect.SetLeft( wxMax(0, left) ); rect.SetTop( wxMax(0, top) ); rect.SetRight( wxMin(cw, right) ); @@ -5780,7 +8357,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 ) { @@ -5788,6 +8365,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; @@ -5821,11 +8399,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; @@ -5836,4 +8416,3 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec #endif // ifndef wxUSE_NEW_GRID -