X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab79958a7fdd0ad585436abefa5a49568a2d8122..6ba636000f13b4bf7d3e7dcfad429713085f6700:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 8f8fcddd87..5e8559b6c4 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: @@ -9,11 +9,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #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" @@ -31,17 +39,40 @@ #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 -#include "wx/generic/grid.h" +// Required for wxIs... functions +#include // ---------------------------------------------------------------------------- -// array classes instantiation +// array classes // ---------------------------------------------------------------------------- +WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs); + struct wxGridCellWithAttr { wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_) @@ -58,7 +89,7 @@ struct wxGridCellWithAttr wxGridCellAttr *attr; }; -WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); +WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); #include "wx/arrimpl.cpp" @@ -82,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() @@ -101,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() @@ -119,6 +152,7 @@ private: void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& event ); + void OnKeyUp( wxKeyEvent& ); void OnPaint( wxPaintEvent& event ); DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow) @@ -151,19 +185,57 @@ private: void OnPaint( wxPaintEvent &event ); void OnMouseEvent( wxMouseEvent& event ); void OnKeyDown( wxKeyEvent& ); + void OnKeyUp( wxKeyEvent& ); + void OnEraseBackground( wxEraseEvent& ); + DECLARE_DYNAMIC_CLASS(wxGridWindow) DECLARE_EVENT_TABLE() }; + + +class wxGridCellEditorEvtHandler : public wxEvtHandler +{ +public: + wxGridCellEditorEvtHandler() + : m_grid(0), m_editor(0) + { } + wxGridCellEditorEvtHandler(wxGrid* grid, wxGridCellEditor* editor) + : m_grid(grid), m_editor(editor) + { } + + void OnKeyDown(wxKeyEvent& event); + void OnChar(wxKeyEvent& event); + +private: + wxGrid* m_grid; + wxGridCellEditor* m_editor; + DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler) + DECLARE_EVENT_TABLE() +}; + + +IMPLEMENT_DYNAMIC_CLASS( wxGridCellEditorEvtHandler, wxEvtHandler ) +BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler ) + EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown ) + EVT_CHAR( wxGridCellEditorEvtHandler::OnChar ) +END_EVENT_TABLE() + + + +// ---------------------------------------------------------------------------- // the internal data representation used by wxGridCellAttrProvider -// -// TODO make it more efficient -class WXDLLEXPORT wxGridCellAttrProviderData +// ---------------------------------------------------------------------------- + +// this class stores attributes set for cells +class WXDLLEXPORT wxGridCellAttrData { public: void SetAttr(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 @@ -172,6 +244,90 @@ private: wxGridCellWithAttrArray m_attrs; }; +// this class stores attributes set for rows or columns +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; + wxArrayAttrs m_attrs; +}; + +// NB: this is just a wrapper around 3 objects: one which stores cell +// attributes, and 2 others for row/col ones +class WXDLLEXPORT wxGridCellAttrProviderData +{ +public: + wxGridCellAttrData m_cellAttrs; + wxGridRowOrColAttrData m_rowAttrs, + m_colAttrs; +}; + + +// ---------------------------------------------------------------------------- +// 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 // ---------------------------------------------------------------------------- @@ -180,7 +336,19 @@ private: #define WXGRID_DRAW_LINES 1 #endif -////////////////////////////////////////////////////////////////////// +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +//#define DEBUG_ATTR_CACHE +#ifdef DEBUG_ATTR_CACHE + static size_t gs_nAttrCacheHits = 0; + static size_t gs_nAttrCacheMisses = 0; +#endif // DEBUG_ATTR_CACHE + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- wxGridCellCoords wxGridNoCellCoords( -1, -1 ); wxRect wxGridNoCellRect( -1, -1, -1, -1 ); @@ -189,271 +357,2221 @@ 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 // ============================================================================ // ---------------------------------------------------------------------------- -// wxGridCellRenderer +// wxGridCellEditor // ---------------------------------------------------------------------------- -void wxGridCellRenderer::Draw(wxGrid& grid, - wxDC& dc, - const wxRect& rect, - int row, int col, - bool isSelected) +wxGridCellEditor::wxGridCellEditor() { - dc.SetBackgroundMode( wxSOLID ); + m_control = NULL; +} - if ( isSelected ) - { - // FIXME customize - dc.SetBrush( *wxBLACK_BRUSH ); - } - else - { - dc.SetBrush( wxBrush(grid.GetCellBackgroundColour(row, col), wxSOLID) ); - } - dc.SetPen( *wxTRANSPARENT_PEN ); +wxGridCellEditor::~wxGridCellEditor() +{ + Destroy(); +} - dc.DrawRectangle(rect); +void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent), + wxWindowID WXUNUSED(id), + wxEvtHandler* evtHandler) +{ + if ( evtHandler ) + m_control->PushEventHandler(evtHandler); } -void wxGridCellStringRenderer::Draw(wxGrid& grid, - wxDC& dc, - const wxRect& rectCell, - int row, int col, - bool isSelected) +void wxGridCellEditor::PaintBackground(const wxRect& rectCell, + wxGridCellAttr *attr) { - wxGridCellRenderer::Draw(grid, dc, rectCell, row, col, isSelected); + // 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); - // now we only have to draw the text - dc.SetBackgroundMode( wxTRANSPARENT ); + // redraw the control we just painted over + m_control->Refresh(); +} - if ( isSelected ) - { - // FIXME customize - dc.SetTextBackground( wxColour(0, 0, 0) ); - dc.SetTextForeground( wxColour(255, 255, 255) ); - } - else +void wxGridCellEditor::Destroy() +{ + if (m_control) { - dc.SetTextBackground( grid.GetCellBackgroundColour(row, col) ); - dc.SetTextForeground( grid.GetCellTextColour(row, col) ); + m_control->PopEventHandler(TRUE /* delete it*/); + + m_control->Destroy(); + m_control = NULL; } - dc.SetFont( grid.GetCellFont(row, col) ); +} - int hAlign, vAlign; - grid.GetCellAlignment(row, col, &hAlign, &vAlign); +void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + m_control->Show(show); - wxRect rect = rectCell; - rect.x++; - rect.y++; - rect.width -= 2; - rect.height -= 2; + if ( show ) + { + // set the colours/fonts if we have any + if ( attr ) + { + m_colFgOld = m_control->GetForegroundColour(); + m_control->SetForegroundColour(attr->GetTextColour()); - grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), - rect, hAlign, vAlign); -} + m_colBgOld = m_control->GetBackgroundColour(); + m_control->SetBackgroundColour(attr->GetBackgroundColour()); -// ---------------------------------------------------------------------------- -// wxGridCellAttrProviderData -// ---------------------------------------------------------------------------- + m_fontOld = m_control->GetFont(); + m_control->SetFont(attr->GetFont()); -void wxGridCellAttrProviderData::SetAttr(wxGridCellAttr *attr, - int row, int col) -{ - int n = FindIndex(row, col); - if ( n == wxNOT_FOUND ) - { - // add the attribute - m_attrs.Add(new wxGridCellWithAttr(row, col, attr)); + // can't do anything more in the base class version, the other + // attributes may only be used by the derived classes + } } else { - if ( attr ) + // restore the standard colours fonts + if ( m_colFgOld.Ok() ) { - // change the attribute - m_attrs[(size_t)n].attr = attr; + m_control->SetForegroundColour(m_colFgOld); + m_colFgOld = wxNullColour; } - else + + if ( m_colBgOld.Ok() ) { - // remove this attribute - m_attrs.RemoveAt((size_t)n); + m_control->SetBackgroundColour(m_colBgOld); + m_colBgOld = wxNullColour; + } + + if ( m_fontOld.Ok() ) + { + m_control->SetFont(m_fontOld); + m_fontOld = wxNullFont; } } } -wxGridCellAttr *wxGridCellAttrProviderData::GetAttr(int row, int col) const +void wxGridCellEditor::SetSize(const wxRect& rect) { - wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); +} - int n = FindIndex(row, col); - if ( n != wxNOT_FOUND ) - { - attr = m_attrs[(size_t)n].attr; - attr->IncRef(); - } +void wxGridCellEditor::HandleReturn(wxKeyEvent& event) +{ + event.Skip(); +} - return attr; +bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) +{ + // accept the simple key presses, not anything with Ctrl/Alt/Meta + return !event.HasModifiers(); } -int wxGridCellAttrProviderData::FindIndex(int row, int col) const +void wxGridCellEditor::StartingKey(wxKeyEvent& event) { - size_t count = m_attrs.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - const wxGridCellCoords& coords = m_attrs[n].coords; - if ( (coords.GetRow() == row) && (coords.GetCol() == col) ) - { - return n; - } - } + event.Skip(); +} - return wxNOT_FOUND; +void wxGridCellEditor::StartingClick() +{ } // ---------------------------------------------------------------------------- -// wxGridCellAttrProvider +// wxGridCellTextEditor // ---------------------------------------------------------------------------- -wxGridCellAttrProvider::wxGridCellAttrProvider() +wxGridCellTextEditor::wxGridCellTextEditor() { - m_data = (wxGridCellAttrProviderData *)NULL; + m_maxChars = 0; } -wxGridCellAttrProvider::~wxGridCellAttrProvider() +void wxGridCellTextEditor::Create(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler) { - delete m_data; -} + m_control = new wxTextCtrl(parent, id, wxEmptyString, + wxDefaultPosition, wxDefaultSize +#if defined(__WXMSW__) + , wxTE_MULTILINE | wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL +#endif + ); -void wxGridCellAttrProvider::InitData() -{ - m_data = new wxGridCellAttrProviderData; + // TODO: use m_maxChars + + wxGridCellEditor::Create(parent, id, evtHandler); } -wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const +void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell), + wxGridCellAttr * WXUNUSED(attr)) { - return m_data ? m_data->GetAttr(row, col) : (wxGridCellAttr *)NULL; + // as we fill the entire client area, don't do anything here to minimize + // flicker } -void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr, - int row, int col) +void wxGridCellTextEditor::SetSize(const wxRect& rectOrig) { - if ( !m_data ) - InitData(); - - m_data->SetAttr(attr, row, col); -} + wxRect rect(rectOrig); -////////////////////////////////////////////////////////////////////// -// -// Abstract base class for grid data (the model) -// -IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject ) + // 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 -wxGridTableBase::wxGridTableBase() -{ - m_view = (wxGrid *) NULL; - m_attrProvider = (wxGridCellAttrProvider *) NULL; + wxGridCellEditor::SetSize(rect); } -wxGridTableBase::~wxGridTableBase() +void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid) { - delete m_attrProvider; -} + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); -void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider) -{ - delete m_attrProvider; - m_attrProvider = attrProvider; -} + m_startValue = grid->GetTable()->GetValue(row, col); -wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col) -{ - if ( m_attrProvider ) - return m_attrProvider->GetAttr(row, col); - else - return (wxGridCellAttr *)NULL; + DoBeginEdit(m_startValue); } -void wxGridTableBase::SetAttr(wxGridCellAttr *attr, int row, int col ) +void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue) { - if ( m_attrProvider ) - { - m_attrProvider->SetAttr(attr, row, col); - } - else - { - // as we take ownership of the pointer and don't store it, we must - // free it now - attr->SafeDecRef(); - } + Text()->SetValue(startValue); + Text()->SetInsertionPointEnd(); + Text()->SetFocus(); } -bool wxGridTableBase::InsertRows( size_t pos, size_t numRows ) +bool wxGridCellTextEditor::EndEdit(int row, int col, + wxGrid* grid) { - wxFAIL_MSG( wxT("Called grid table class function InsertRows\n" - "but your derived table class does not override this function") ); + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); - return FALSE; -} + bool changed = FALSE; + wxString value = Text()->GetValue(); + if (value != m_startValue) + changed = TRUE; -bool wxGridTableBase::AppendRows( size_t numRows ) -{ - wxFAIL_MSG( wxT("Called grid table class function AppendRows\n" - "but your derived table class does not override this function")); + if (changed) + grid->GetTable()->SetValue(row, col, value); - return FALSE; + m_startValue = wxEmptyString; + Text()->SetValue(m_startValue); + + return changed; } -bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows ) + +void wxGridCellTextEditor::Reset() { - wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n" - "but your derived table class does not override this function")); + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); - return FALSE; + DoReset(m_startValue); } -bool wxGridTableBase::InsertCols( size_t pos, size_t numCols ) +void wxGridCellTextEditor::DoReset(const wxString& startValue) { - wxFAIL_MSG( wxT("Called grid table class function InsertCols\n" - "but your derived table class does not override this function")); - - return FALSE; + Text()->SetValue(startValue); + Text()->SetInsertionPointEnd(); } -bool wxGridTableBase::AppendCols( size_t numCols ) +bool wxGridCellTextEditor::IsAcceptedKey(wxKeyEvent& event) { - wxFAIL_MSG(wxT("Called grid table class function AppendCols\n" - "but your derived table class does not override this function")); + 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; + + default: + // accept 8 bit chars too if isprint() agrees + if ( (keycode < 255) && (isprint(keycode)) ) + return TRUE; + } + } return FALSE; } -bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols ) +void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) { - wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n" - "but your derived table class does not override this function")); + // we don't check for !HasModifiers() because IsAcceptedKey() did it - return FALSE; -} + // 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; -wxString wxGridTableBase::GetRowLabelValue( int row ) -{ - wxString s; - s << row; - return s; -} + case WXK_ADD: + case WXK_NUMPAD_ADD: + ch = _T('+'); + break; -wxString wxGridTableBase::GetColLabelValue( int col ) -{ - // default col labels are: - // cols 0 to 25 : A-Z - // cols 26 to 675 : AA-ZZ + 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& + WXUNUSED_GTK(WXUNUSED_MOTIF(event)) ) +{ +#if defined(__WXMOTIF__) || defined(__WXGTK__) + // wxMotif needs a little extra help... + size_t pos = (size_t)( Text()->GetInsertionPoint() ); + wxString s( Text()->GetValue() ); + s = s.Left(pos) + "\n" + s.Mid(pos); + Text()->SetValue(s); + Text()->SetInsertionPoint( pos ); +#else + // the other ports can handle a Return key press + // + event.Skip(); +#endif +} + +void wxGridCellTextEditor::SetParameters(const wxString& params) +{ + if ( !params ) + { + // reset to default + m_maxChars = 0; + } + else + { + long tmp; + if ( !params.ToLong(&tmp) ) + { + wxLogDebug(_T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str()); + } + else + { + m_maxChars = (size_t)tmp; + } + } +} + +// ---------------------------------------------------------------------------- +// wxGridCellNumberEditor +// ---------------------------------------------------------------------------- + +wxGridCellNumberEditor::wxGridCellNumberEditor(int min, int max) +{ + m_min = min; + m_max = max; +} + +void wxGridCellNumberEditor::Create(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler) +{ + if ( HasRange() ) + { + // 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 + { + // just a text control + wxGridCellTextEditor::Create(parent, id, evtHandler); + +#if wxUSE_VALIDATORS + Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); +#endif // wxUSE_VALIDATORS + } +} + +void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid) +{ + // 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 ( HasRange() ) + { + Spin()->SetValue((int)m_valueOld); + Spin()->SetFocus(); + } + else + { + DoBeginEdit(GetString()); + } +} + +bool wxGridCellNumberEditor::EndEdit(int row, int col, + wxGrid* grid) +{ + bool changed; + long value; + + if ( HasRange() ) + { + value = Spin()->GetValue(); + changed = value != m_valueOld; + } + else + { + changed = Text()->GetValue().ToLong(&value) && (value != m_valueOld); + } + + 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)); + } + + return changed; +} + +void wxGridCellNumberEditor::Reset() +{ + if ( HasRange() ) + { + Spin()->SetValue((int)m_valueOld); + } + else + { + DoReset(GetString()); + } +} + +bool wxGridCellNumberEditor::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_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_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: + 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; + } +} + + +const wxFont& wxGridCellAttr::GetFont() const +{ + if (HasFont()) + return m_font; + else if (m_defGridAttr != this) + return m_defGridAttr->GetFont(); + else + { + wxFAIL_MSG(wxT("Missing default cell attribute")); + return wxNullFont; + } +} + + +void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const +{ + if (HasAlignment()) + { + if ( hAlign ) *hAlign = m_hAlign; + if ( vAlign ) *vAlign = m_vAlign; + } + else if (m_defGridAttr != this) + m_defGridAttr->GetAlignment(hAlign, vAlign); + else + { + wxFAIL_MSG(wxT("Missing default cell attribute")); + } +} + + +// 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 +{ + 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 renderer; +} + +wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const +{ + 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 editor; +} + +// ---------------------------------------------------------------------------- +// wxGridCellAttrData +// ---------------------------------------------------------------------------- + +void wxGridCellAttrData::SetAttr(wxGridCellAttr *attr, int row, int col) +{ + int n = FindIndex(row, col); + if ( n == wxNOT_FOUND ) + { + // add the attribute + m_attrs.Add(new wxGridCellWithAttr(row, col, attr)); + } + else + { + if ( attr ) + { + // change the attribute + m_attrs[(size_t)n].attr = attr; + } + else + { + // remove this attribute + m_attrs.RemoveAt((size_t)n); + } + } +} + +wxGridCellAttr *wxGridCellAttrData::GetAttr(int row, int col) const +{ + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + + int n = FindIndex(row, col); + if ( n != wxNOT_FOUND ) + { + attr = m_attrs[(size_t)n].attr; + attr->IncRef(); + } + + return attr; +} + +void wxGridCellAttrData::UpdateAttrRows( size_t pos, int numRows ) +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxGridCellCoords& coords = m_attrs[n].coords; + wxCoord row = coords.GetRow(); + if ((size_t)row >= pos) + { + if (numRows > 0) + { + // If rows inserted, include row counter where necessary + coords.SetRow(row + numRows); + } + else if (numRows < 0) + { + // If rows deleted ... + if ((size_t)row >= pos - numRows) + { + // ...either decrement row counter (if row still exists)... + coords.SetRow(row + numRows); + } + else + { + // ...or remove the attribute + m_attrs.RemoveAt((size_t)n); + n--; count--; + } + } + } + } +} + +void wxGridCellAttrData::UpdateAttrCols( size_t pos, int numCols ) +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxGridCellCoords& coords = m_attrs[n].coords; + wxCoord col = coords.GetCol(); + if ( (size_t)col >= pos ) + { + if ( numCols > 0 ) + { + // If rows inserted, include row counter where necessary + coords.SetCol(col + numCols); + } + else if (numCols < 0) + { + // If rows deleted ... + if ((size_t)col >= pos - numCols) + { + // ...either decrement row counter (if row still exists)... + coords.SetCol(col + numCols); + } + else + { + // ...or remove the attribute + m_attrs.RemoveAt((size_t)n); + n--; count--; + } + } + } + } +} + +int wxGridCellAttrData::FindIndex(int row, int col) const +{ + size_t count = m_attrs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + const wxGridCellCoords& coords = m_attrs[n].coords; + if ( (coords.GetRow() == row) && (coords.GetCol() == col) ) + { + return n; + } + } + + return wxNOT_FOUND; +} + +// ---------------------------------------------------------------------------- +// wxGridRowOrColAttrData +// ---------------------------------------------------------------------------- + +wxGridRowOrColAttrData::~wxGridRowOrColAttrData() +{ + size_t count = m_attrs.Count(); + for ( size_t n = 0; n < count; n++ ) + { + m_attrs[n]->DecRef(); + } +} + +wxGridCellAttr *wxGridRowOrColAttrData::GetAttr(int rowOrCol) const +{ + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + + int n = m_rowsOrCols.Index(rowOrCol); + if ( n != wxNOT_FOUND ) + { + attr = m_attrs[(size_t)n]; + attr->IncRef(); + } + + return attr; +} + +void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol) +{ + int i = m_rowsOrCols.Index(rowOrCol); + if ( i == wxNOT_FOUND ) + { + // add the attribute + m_rowsOrCols.Add(rowOrCol); + m_attrs.Add(attr); + } + else + { + size_t n = (size_t)i; + if ( attr ) + { + // change the attribute + m_attrs[n]->DecRef(); + m_attrs[n] = attr; + } + else + { + // remove this attribute + 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--; + } + } + } + } +} + +// ---------------------------------------------------------------------------- +// wxGridCellAttrProvider +// ---------------------------------------------------------------------------- + +wxGridCellAttrProvider::wxGridCellAttrProvider() +{ + m_data = (wxGridCellAttrProviderData *)NULL; +} + +wxGridCellAttrProvider::~wxGridCellAttrProvider() +{ + delete m_data; +} + +void wxGridCellAttrProvider::InitData() +{ + m_data = new wxGridCellAttrProviderData; +} + +wxGridCellAttr *wxGridCellAttrProvider::GetAttr(int row, int col) const +{ + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + if ( m_data ) + { + // first look for the attribute of this specific cell + attr = m_data->m_cellAttrs.GetAttr(row, col); + + if ( !attr ) + { + // then look for the col attr (col attributes are more common than + // the row ones, hence they have priority) + attr = m_data->m_colAttrs.GetAttr(col); + } + + if ( !attr ) + { + // finally try the row attributes + attr = m_data->m_rowAttrs.GetAttr(row); + } + } + + return attr; +} + +void wxGridCellAttrProvider::SetAttr(wxGridCellAttr *attr, + int row, int col) +{ + if ( !m_data ) + InitData(); + + m_data->m_cellAttrs.SetAttr(attr, row, col); +} + +void wxGridCellAttrProvider::SetRowAttr(wxGridCellAttr *attr, int row) +{ + if ( !m_data ) + InitData(); + + m_data->m_rowAttrs.SetAttr(attr, row); +} + +void wxGridCellAttrProvider::SetColAttr(wxGridCellAttr *attr, int col) +{ + if ( !m_data ) + InitData(); + + m_data->m_colAttrs.SetAttr(attr, col); +} + +void wxGridCellAttrProvider::UpdateAttrRows( size_t pos, int numRows ) +{ + if ( m_data ) + { + m_data->m_cellAttrs.UpdateAttrRows( pos, numRows ); + + m_data->m_rowAttrs.UpdateAttrRowsOrCols( pos, numRows ); + } +} + +void wxGridCellAttrProvider::UpdateAttrCols( size_t pos, int numCols ) +{ + if ( m_data ) + { + m_data->m_cellAttrs.UpdateAttrCols( pos, numCols ); + + m_data->m_colAttrs.UpdateAttrRowsOrCols( pos, numCols ); + } +} + +// ---------------------------------------------------------------------------- +// 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; + renderer->IncRef(); + return renderer; +} + +wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) +{ + wxGridCellEditor* editor = m_typeinfo[index]->m_editor; + editor->IncRef(); + return editor; +} + +// ---------------------------------------------------------------------------- +// wxGridTableBase +// ---------------------------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject ) + + +wxGridTableBase::wxGridTableBase() +{ + m_view = (wxGrid *) NULL; + m_attrProvider = (wxGridCellAttrProvider *) NULL; +} + +wxGridTableBase::~wxGridTableBase() +{ + delete m_attrProvider; +} + +void wxGridTableBase::SetAttrProvider(wxGridCellAttrProvider *attrProvider) +{ + delete m_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 ) + return m_attrProvider->GetAttr(row, col); + else + return (wxGridCellAttr *)NULL; +} + +void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) +{ + if ( m_attrProvider ) + { + m_attrProvider->SetAttr(attr, row, col); + } + else + { + // as we take ownership of the pointer and don't store it, we must + // free it now + wxSafeDecRef(attr); + } +} + +void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row) +{ + if ( m_attrProvider ) + { + m_attrProvider->SetRowAttr(attr, row); + } + else + { + // as we take ownership of the pointer and don't store it, we must + // free it now + wxSafeDecRef(attr); + } +} + +void wxGridTableBase::SetColAttr(wxGridCellAttr *attr, int col) +{ + if ( m_attrProvider ) + { + m_attrProvider->SetColAttr(attr, col); + } + else + { + // as we take ownership of the pointer and don't store it, we must + // free it now + wxSafeDecRef(attr); + } +} + +bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos), + size_t WXUNUSED(numRows) ) +{ + 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 WXUNUSED(numRows) ) +{ + 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 WXUNUSED(pos), + size_t WXUNUSED(numRows) ) +{ + 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 WXUNUSED(pos), + size_t WXUNUSED(numCols) ) +{ + 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 WXUNUSED(numCols) ) +{ + 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 WXUNUSED(pos), + size_t WXUNUSED(numCols) ) +{ + wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function")); + + return FALSE; +} + + +wxString wxGridTableBase::GetRowLabelValue( int row ) +{ + wxString s; + s << row + 1; // RD: Starting the rows at zero confuses users, no matter + // how much it makes sense to us geeks. + return s; +} + +wxString wxGridTableBase::GetColLabelValue( int col ) +{ + // default col labels are: + // cols 0 to 25 : A-Z + // cols 26 to 675 : AA-ZZ // etc. wxString s; @@ -476,6 +2594,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) ) +{ +} ////////////////////////////////////////////////////////////////////// // @@ -541,12 +2717,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(); @@ -556,26 +2732,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; @@ -602,7 +2780,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 ) { @@ -620,7 +2799,6 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) { m_data.Insert( sa, row ); } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -639,7 +2817,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 ) @@ -677,10 +2856,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; } @@ -700,7 +2878,6 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) m_data.Remove( pos ); } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -719,7 +2896,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 ) { @@ -733,7 +2911,6 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) m_data[row].Insert( wxEmptyString, col ); } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -752,14 +2929,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++ ) { @@ -786,15 +2964,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; } @@ -817,7 +2995,6 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) } } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -871,136 +3048,27 @@ void wxGridStringTable::SetRowLabelValue( int row, const wxString& value ) } } - m_rowLabels[row] = value; -} - -void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) -{ - if ( col > (int)(m_colLabels.GetCount()) - 1 ) - { - int n = m_colLabels.GetCount(); - int i; - for ( i = n; i <= col; i++ ) - { - m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) ); - } - } - - m_colLabels[col] = value; -} - - - - -////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC_CLASS( wxGridTextCtrl, wxTextCtrl ) - -BEGIN_EVENT_TABLE( wxGridTextCtrl, wxTextCtrl ) - EVT_KEY_DOWN( wxGridTextCtrl::OnKeyDown ) -END_EVENT_TABLE() - - -wxGridTextCtrl::wxGridTextCtrl( wxWindow *par, - wxGrid *grid, - bool isCellControl, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style ) - : wxTextCtrl( par, id, value, pos, size, style ) -{ - m_grid = grid; - m_isCellControl = isCellControl; + m_rowLabels[row] = value; } - -void wxGridTextCtrl::OnKeyDown( wxKeyEvent& event ) +void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) { - switch ( event.KeyCode() ) + if ( col > (int)(m_colLabels.GetCount()) - 1 ) { - case WXK_ESCAPE: - m_grid->SetEditControlValue( startValue ); - SetInsertionPointEnd(); - break; - - case WXK_UP: - case WXK_DOWN: - case WXK_LEFT: - case WXK_RIGHT: - case WXK_PRIOR: - case WXK_NEXT: - case WXK_SPACE: - if ( m_isCellControl ) - { - // send the event to the parent grid, skipping the - // event if nothing happens - // - event.Skip( m_grid->ProcessEvent( event ) ); - } - else - { - // default text control response within the top edit - // control - // - event.Skip(); - } - break; - - case WXK_RETURN: - if ( m_isCellControl ) - { - if ( !m_grid->ProcessEvent( event ) ) - { -#if defined(__WXMOTIF__) || defined(__WXGTK__) - // wxMotif needs a little extra help... - // - int pos = GetInsertionPoint(); - wxString s( GetValue() ); - s = s.Left(pos) + "\n" + s.Mid(pos); - SetValue(s); - SetInsertionPoint( pos ); -#else - // the other ports can handle a Return key press - // - event.Skip(); -#endif - } - } - break; - - case WXK_HOME: - case WXK_END: - if ( m_isCellControl ) - { - // send the event to the parent grid, skipping the - // event if nothing happens - // - event.Skip( m_grid->ProcessEvent( event ) ); - } - else - { - // default text control response within the top edit - // control - // - event.Skip(); - } - break; - - default: - event.Skip(); + int n = m_colLabels.GetCount(); + int i; + for ( i = n; i <= col; i++ ) + { + m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) ); + } } -} -void wxGridTextCtrl::SetStartValue( const wxString& s ) -{ - startValue = s; - wxTextCtrl::SetValue(s); + m_colLabels[col] = value; } +////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow ) @@ -1009,17 +3077,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); @@ -1052,6 +3121,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(); +} + ////////////////////////////////////////////////////////////////////// @@ -1062,17 +3136,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); @@ -1105,6 +3180,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(); +} + ////////////////////////////////////////////////////////////////////// @@ -1115,12 +3195,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; } @@ -1157,6 +3238,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(); +} + ////////////////////////////////////////////////////////////////////// @@ -1167,18 +3253,19 @@ 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() 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; m_colLabelWin = colLblWin; - SetBackgroundColour( "WHITE" ); } @@ -1198,6 +3285,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 ); } @@ -1215,7 +3304,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 ) @@ -1223,16 +3312,27 @@ void wxGridWindow::OnKeyDown( wxKeyEvent& event ) if ( !m_owner->ProcessEvent( event ) ) event.Skip(); } +void wxGridWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->ProcessEvent( event ) ) event.Skip(); +} + +void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) ) +{ +} ////////////////////////////////////////////////////////////////////// + IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow ) 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() wxGrid::wxGrid( wxWindow *parent, @@ -1241,7 +3341,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(); } @@ -1249,8 +3351,22 @@ wxGrid::wxGrid( wxWindow *parent, wxGrid::~wxGrid() { - delete m_defaultRenderer; - delete m_table; + ClearAttrCache(); + wxSafeDecRef(m_defaultCellAttr); + +#ifdef DEBUG_ATTR_CACHE + size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses; + wxPrintf(_T("wxGrid attribute cache statistics: " + "total: %u, hits: %u (%u%%)\n"), + total, gs_nAttrCacheHits, + total ? (gs_nAttrCacheHits*100) / total : 0); +#endif + + if (m_ownTable) + delete m_table; + + delete m_typeRegistry; + delete m_selection; } @@ -1261,10 +3377,25 @@ wxGrid::~wxGrid() void wxGrid::Create() { m_created = FALSE; // set to TRUE by CreateGrid - m_displayed = FALSE; // set to TRUE by OnPaint m_table = (wxGridTableBase *) NULL; - m_cellEditCtrl = (wxWindow *) NULL; + m_ownTable = FALSE; + + m_cellEditCtrlEnabled = FALSE; + + m_defaultCellAttr = new wxGridCellAttr; + m_defaultCellAttr->SetDefAttr(m_defaultCellAttr); + + // 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; m_numCols = 0; @@ -1273,6 +3404,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, @@ -1299,20 +3434,60 @@ void wxGrid::Create() } -bool wxGrid::CreateGrid( int numRows, int numCols ) +bool wxGrid::CreateGrid( int numRows, int numCols, + wxGrid::wxGridSelectionModes selmode ) +{ + 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; + m_selection = new wxGridSelection( this, selmode ); + Init(); + m_created = TRUE; + + return m_created; +} + +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 ) { - wxFAIL_MSG( wxT("wxGrid::CreateGrid called more than once") ); + // RD: Actually, this should probably be allowed. I think it would be + // nice to be able to switch multiple Tables in and out of a single + // View at runtime. Is there anything in the implmentation that would + // prevent this? + + // At least, you now have to cope with m_selection + wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") ); return FALSE; } else { - m_numRows = numRows; - m_numCols = numCols; + m_numRows = table->GetNumberRows(); + m_numCols = table->GetNumberCols(); - m_table = new wxGridStringTable( m_numRows, m_numCols ); + m_table = table; m_table->SetView( this ); + if (takeOwnership) + m_ownTable = TRUE; + m_selection = new wxGridSelection( this, selmode ); Init(); m_created = TRUE; } @@ -1323,14 +3498,6 @@ bool wxGrid::CreateGrid( int numRows, int numCols ) 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; @@ -1345,16 +3512,19 @@ void wxGrid::Init() m_labelTextColour = wxColour( _T("BLACK") ); + // init attr cache + m_attrCache.row = -1; + // TODO: something better than this ? // 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(); @@ -1365,86 +3535,129 @@ void wxGrid::Init() m_defaultRowHeight += 4; #endif + 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; + m_startDragPos = wxDefaultPosition; + + m_waitForSlowClick = FALSE; + + m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS ); + m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE ); + + m_currentCellCoords = wxGridNoCellCoords; + + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; + m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT); + m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT); + + m_editable = TRUE; // default for whole grid + + m_inOnKeyDown = FALSE; + m_batchCount = 0; + + 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 ( i = 0; i < m_numRows; i++ ) + 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 ( i = 0; i < m_numCols; i++ ) + for ( int i = 0; i < m_numCols; i++ ) { m_colWidths.Add( m_defaultColWidth ); colRight += m_defaultColWidth; m_colRights.Add( colRight ); } +} - // TODO: improve this by using wxSystemSettings? - // - m_defaultCellFont = GetFont(); - - m_defaultCellHAlign = wxLEFT; - m_defaultCellVAlign = wxTOP; - - m_defaultRenderer = (wxGridCellRenderer *)NULL; - - m_gridLineColour = wxColour( 128, 128, 255 ); - m_gridLinesEnabled = TRUE; - - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - m_winCapture = (wxWindow *)NULL; - m_dragLastPos = -1; - m_dragRowOrCol = -1; - m_isDragging = FALSE; - - m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS ); - m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE ); - - m_currentCellCoords = wxGridNoCellCoords; - - m_selectedTopLeft = wxGridNoCellCoords; - m_selectedBottomRight = wxGridNoCellCoords; +int wxGrid::GetColWidth(int col) const +{ + return m_colWidths.IsEmpty() ? m_defaultColWidth : m_colWidths[col]; +} - m_editable = TRUE; // default for whole grid +int wxGrid::GetColLeft(int col) const +{ + return m_colRights.IsEmpty() ? col * m_defaultColWidth + : m_colRights[col] - m_colWidths[col]; +} - m_inOnKeyDown = FALSE; - m_batchCount = 0; +int wxGrid::GetColRight(int col) const +{ + return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth + : m_colRights[col]; +} - // TODO: extend this to other types of controls - // - m_cellEditCtrl = new wxGridTextCtrl( m_gridWin, - this, - TRUE, - wxGRID_CELLCTRL, - "", - wxPoint(1,1), - wxSize(1,1) -#if defined(__WXMSW__) - , wxTE_MULTILINE | wxTE_NO_VSCROLL -#endif - ); +int wxGrid::GetRowHeight(int row) const +{ + return m_rowHeights.IsEmpty() ? m_defaultRowHeight : m_rowHeights[row]; +} - m_cellEditCtrl->Show( FALSE ); - m_cellEditCtrlEnabled = TRUE; - m_editCtrlType = wxGRID_TEXTCTRL; +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 // @@ -1482,6 +3695,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() ) { @@ -1489,71 +3717,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++ ) @@ -1562,82 +3818,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_numCols += numCols; + + 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++ ) + { + right += m_colWidths[i]; + m_colRights[i] = right; + } + } + if ( m_currentCellCoords == wxGridNoCellCoords ) { - m_colWidths.Insert( m_defaultColWidth, pos ); - m_colRights.Insert( 0, pos ); + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); } - m_numCols += numCols; - - int right = 0; - if ( pos > 0 ) right = m_colRights[pos-1]; - - for ( i = pos; i < m_numCols; i++ ) + m_selection->UpdateCols( pos, numCols ); + wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); + if (attrProvider) + attrProvider->UpdateAttrCols( pos, numCols ); + if ( !GetBatchCount() ) { - right += m_colWidths[i]; - m_colRights[i] = right; + CalcDimensions(); + m_colLabelWin->Refresh(); } - CalcDimensions(); + } - 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++ ) @@ -1646,16 +3954,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; @@ -1688,13 +4031,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 ); } @@ -1704,7 +4047,7 @@ void wxGrid::CalcRowLabelsExposed( wxRegion& reg ) } -void wxGrid::CalcColLabelsExposed( wxRegion& reg ) +void wxGrid::CalcColLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; @@ -1737,13 +4080,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 ); } @@ -1753,7 +4096,7 @@ void wxGrid::CalcColLabelsExposed( wxRegion& reg ) } -void wxGrid::CalcCellsExposed( wxRegion& reg ) +void wxGrid::CalcCellsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; @@ -1789,29 +4132,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++; } } @@ -1838,6 +4183,9 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); + y = wxMax( y, + GetRowTop(m_dragRowOrCol) + + GetRowMinimalHeight(m_dragRowOrCol) ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -1849,10 +4197,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 @@ -1887,9 +4238,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); } } @@ -1897,7 +4264,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); } } @@ -1909,7 +4277,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 ); } } @@ -1925,7 +4293,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); @@ -1938,7 +4306,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 } @@ -1950,7 +4318,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 } @@ -1967,7 +4335,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 ) @@ -2000,6 +4369,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); + + x = wxMax( x, GetColLeft(m_dragRowOrCol) + + GetColMinimalWidth(m_dragRowOrCol)); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2011,10 +4383,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 @@ -2049,9 +4424,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); } } @@ -2059,7 +4449,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); } } @@ -2071,7 +4462,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 ); } } @@ -2087,7 +4478,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); @@ -2100,7 +4491,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 } @@ -2112,7 +4503,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 } @@ -2129,7 +4520,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 ) @@ -2147,7 +4539,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(); } @@ -2155,12 +4547,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 } @@ -2168,7 +4560,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 } @@ -2250,22 +4642,64 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( event.Dragging() ) { + //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol()); + + // Don't start doing anything until the mouse has been drug at + // least 3 pixels in any direction... + if (! m_isDragging) + { + if (m_startDragPos == wxDefaultPosition) + { + m_startDragPos = pos; + return; + } + if (abs(m_startDragPos.x - pos.x) < 4 && abs(m_startDragPos.y - pos.y) < 4) + return; + } + m_isDragging = TRUE; if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { // 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) + { + 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)) + { + MakeCellVisible(coords); + // TODO: need to introduce a delay or something here. The + // scrolling is way to fast, at least on MSW - also on GTK. } } } @@ -2277,6 +4711,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); + y = wxMax( y, GetRowTop(m_dragRowOrCol) + + GetRowMinimalHeight(m_dragRowOrCol) ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2293,6 +4729,8 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); + x = wxMax( x, GetColLeft(m_dragRowOrCol) + + GetColMinimalWidth(m_dragRowOrCol) ); dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { @@ -2306,172 +4744,246 @@ 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 ) ) { + 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 ); - SetCurrentCell( coords ); + if ( event.ControlDown() ) + { + m_selection->ToggleCellSelection( coords.GetRow(), + coords.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; + m_selectingKeyboard = coords; + } + else + { + SetCurrentCell( coords ); + 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 ) { - 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) { - 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 ) ) { - 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 ) ) { - 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); } } } @@ -2492,8 +5004,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 ) ); @@ -2530,10 +5043,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() ) { @@ -2583,102 +5098,60 @@ bool wxGrid::ProcessTableMessage( wxGridTableMessage& msg ) // The behaviour of this function depends on the grid table class -// Clear() function. For the default wxGridStringTable class the -// behavious is to replace all cell contents with wxEmptyString but -// not to change the number of rows or cols. -// -void wxGrid::ClearGrid() -{ - if ( m_table ) - { - m_table->Clear(); - SetEditControlValue(); - if ( !GetBatchCount() ) m_gridWin->Refresh(); - } -} - - -bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) -{ - // TODO: something with updateLabels flag - - if ( !m_created ) - { - wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); - return FALSE; - } - - if ( m_table ) - { - bool ok = 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 +// Clear() function. For the default wxGridStringTable class the +// behavious is to replace all cell contents with wxEmptyString but +// not to change the number of rows or cols. +// +void wxGrid::ClearGrid() +{ + if ( m_table ) { - return FALSE; + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + + m_table->Clear(); + if ( !GetBatchCount() ) m_gridWin->Refresh(); } } -bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) +bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) { // TODO: something with updateLabels flag if ( !m_created ) { - wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); return FALSE; } - if ( m_table && m_table->AppendRows( numRows ) ) + if ( m_table ) { - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + + return m_table->InsertRows( pos, numRows ); - // the table will have sent the results of the append row + // the table will have sent the results of the insert row // operation to this view object as a grid table message - // - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - return TRUE; } - else + return FALSE; +} + + +bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) +{ + // TODO: something with updateLabels flag + + if ( !m_created ) { + wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); 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 } @@ -2692,24 +5165,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; } @@ -2725,33 +5190,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; } @@ -2765,27 +5211,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 } @@ -2799,24 +5227,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; } @@ -2832,8 +5252,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); @@ -2841,7 +5260,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(), @@ -2849,13 +5269,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(), @@ -2869,7 +5291,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(), @@ -2886,8 +5310,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); @@ -2912,17 +5335,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 } @@ -2930,7 +5343,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(); @@ -2943,7 +5356,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) { // shouldn't be here - we are going round in circles... // - wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while alread active") ); + wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") ); } m_inOnKeyDown = TRUE; @@ -2956,6 +5369,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) ) { + // try local handlers // switch ( event.KeyCode() ) @@ -2963,66 +5377,97 @@ 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_SPACE: - if ( !IsEditable() ) + case WXK_RETURN: + if ( event.ControlDown() ) { - MoveCursorRight(); + event.Skip(); // to let the edit control have the return } else { - event.Skip(); + if ( GetGridCursorRow() < GetNumberRows()-1 ) + { + MoveCursorDown( event.ShiftDown() ); + } + else + { + // at the bottom of a column + HideCellEditControl(); + SaveEditControlValue(); + } } break; - case WXK_RETURN: - if ( event.ControlDown() ) + case WXK_ESCAPE: + ClearSelection(); + break; + + case WXK_TAB: + if (event.ShiftDown()) { - event.Skip(); // to let the edit control have the return + if ( GetGridCursorCol() > 0 ) + { + MoveCursorLeft( FALSE ); + } + else + { + // at left of grid + HideCellEditControl(); + SaveEditControlValue(); + } } else { - MoveCursorDown(); + if ( GetGridCursorCol() < GetNumberCols()-1 ) + { + MoveCursorRight( FALSE ); + } + else + { + // at right of grid + HideCellEditControl(); + SaveEditControlValue(); + } } break; @@ -3058,13 +5503,55 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) MovePageDown(); 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( FALSE ); + break; + } + // Otherwise fall through to default + default: - // now try the cell edit control - // - if ( IsCellEditControlEnabled() ) + // 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 { - event.SetEventObject( m_cellEditCtrl ); - m_cellEditCtrl->GetEventHandler()->ProcessEvent( event ); + // let others process char events with modifiers or all + // char events for readonly cells + event.Skip(); } break; } @@ -3073,37 +5560,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(); + 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; + + DrawGridCellArea(dc); + DrawAllGridLines( dc, r ); + } + } + + m_currentCellCoords = coords; + + wxGridCellAttr* attr = GetCellAttr(coords); + DrawCellHighlight(dc, attr); + attr->DecRef(); +} + + +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 ) + { + temp = leftCol; + leftCol = rightCol; + rightCol = temp; } - m_currentCellCoords = coords; + 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(); + + // 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 ) + { + 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 ) ); + } - SetEditControlValue(); - if ( m_displayed ) - { - ShowCellEditControl(); + // Change Selection + m_selectingTopLeft = updateTopLeft; + m_selectingBottomRight = updateBottomRight; - if ( IsSelection() ) - { - wxRect r( SelectionToDeviceRect() ); - ClearSelection(); - if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r ); - } + // 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) } @@ -3165,12 +5825,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 @@ -3179,44 +5871,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 - wxGridCellRenderer *renderer = GetCellRenderer(row, col); - wxRect rect; - rect.x = m_colRights[col] - m_colWidths[col] + 1; - rect.y = m_rowBottoms[row] - m_rowHeights[row] + 1; - rect.width = m_colWidths[col] - 1; - rect.height = m_rowHeights[row] - 1; + wxGridCellAttr* attr = GetCellAttr(row, col); + + 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(); + } - renderer->Draw(*this, dc, rect, row, col, IsInSelection(coords)); + attr->DecRef(); } -void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) +void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) { - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + return; + + wxRect rect = CellToRect(row, col); + + // 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 ) +{ 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 || @@ -3224,7 +6003,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); @@ -3233,17 +6014,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) ); @@ -3252,13 +6040,16 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) int i; for ( i = 0; i < m_numRows; i++ ) { - if ( m_rowBottoms[i] > bottom ) + int bot = GetRowBottom(i) - 1; + + if ( bot > bottom ) { break; } - else if ( m_rowBottoms[i] >= top ) + + if ( bot >= top ) { - dc.DrawLine( left, m_rowBottoms[i], right, m_rowBottoms[i] ); + dc.DrawLine( left, bot, right, bot ); } } @@ -3267,13 +6058,15 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) // for ( i = 0; i < m_numCols; i++ ) { - if ( m_colRights[i] > right ) + int colRight = GetColRight(i) - 1; + if ( colRight > right ) { break; } - else if ( m_colRights[i] >= left ) + + if ( colRight >= left ) { - dc.DrawLine( m_colRights[i], top, m_colRights[i], bottom ); + dc.DrawLine( colRight, top, colRight, bottom ); } } } @@ -3281,7 +6074,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(); @@ -3295,19 +6088,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 ); @@ -3319,16 +6113,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(); @@ -3342,20 +6136,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() ); @@ -3369,9 +6165,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 ); } @@ -3397,15 +6193,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; @@ -3413,15 +6209,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; @@ -3429,7 +6225,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; } } @@ -3492,6 +6288,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 @@ -3504,133 +6329,146 @@ void wxGrid::EnableEditing( bool edit ) // if ( edit != m_editable ) { + if(!edit) EnableCellEditControl(edit); m_editable = edit; - - // TODO: extend this for other edit control types - // - if ( m_editCtrlType == wxGRID_TEXTCTRL ) - { - ((wxTextCtrl *)m_cellEditCtrl)->SetEditable( m_editable ); - } } } -#if 0 // disabled for the moment - the cell control is always active void wxGrid::EnableCellEditControl( bool enable ) { - if ( m_cellEditCtrl && - enable != m_cellEditCtrlEnabled ) + if (! m_editable) + return; + + if ( m_currentCellCoords == wxGridNoCellCoords ) + SetCurrentCell( 0, 0 ); + + if ( enable != m_cellEditCtrlEnabled ) { - m_cellEditCtrlEnabled = enable; + // TODO allow the app to Veto() this event? + SendEvent(enable ? wxEVT_GRID_EDITOR_SHOWN : wxEVT_GRID_EDITOR_HIDDEN); - if ( m_cellEditCtrlEnabled ) + if ( enable ) { - SetEditControlValue(); + // 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; + ShowCellEditControl(); } else { HideCellEditControl(); SaveEditControlValue(); + + // do it after HideCellEditControl() + m_cellEditCtrlEnabled = enable; } } } -#endif +bool wxGrid::IsCurrentCellReadOnly() const +{ + // const_cast + wxGridCellAttr* attr = ((wxGrid *)this)->GetCellAttr(m_currentCellCoords); + bool readonly = attr->IsReadOnly(); + attr->DecRef(); -void wxGrid::ShowCellEditControl() + return readonly; +} + +bool wxGrid::CanEnableCellControl() const { - wxRect rect; + 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() +{ if ( IsCellEditControlEnabled() ) { if ( !IsVisible( m_currentCellCoords ) ) { + m_cellEditCtrlEnabled = FALSE; return; } else { - rect = CellToRect( m_currentCellCoords ); + wxRect rect = CellToRect( m_currentCellCoords ); + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); // convert to scrolled coords // - int left, top, right, bottom; - CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top ); - CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom ); - - int cw, ch; - m_gridWin->GetClientSize( &cw, &ch ); - - // 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 ( m_currentCellCoords.GetRow() == 0 || - m_currentCellCoords.GetCol() == 0 ) - { - extra = 2; - } - else - { - extra = 4; - } -#else - if ( m_currentCellCoords.GetRow() == 0 || - m_currentCellCoords.GetCol() == 0 ) - { - extra = 1; - } - else - { - extra = 2; - } -#endif + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); -#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 + // 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 - m_cellEditCtrl->SetSize( rect ); - m_cellEditCtrl->Show( TRUE ); + // cell is shifted by one pixel + rect.x--; + rect.y--; - switch ( m_editCtrlType ) + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(this, row, col); + if ( !editor->IsCreated() ) { - case wxGRID_TEXTCTRL: - ((wxTextCtrl *) m_cellEditCtrl)->SetInsertionPointEnd(); - break; + editor->Create(m_gridWin, -1, + new wxGridCellEditorEvtHandler(this, editor)); + } - case wxGRID_CHECKBOX: - // TODO: anything ??? - // - break; + editor->Show( TRUE, attr ); - case wxGRID_CHOICE: - // TODO: anything ??? - // - break; + editor->SetSize( rect ); - case wxGRID_COMBOBOX: - // TODO: anything ??? - // - break; - } + editor->BeginEdit(row, col, this); - m_cellEditCtrl->SetFocus(); - } + editor->DecRef(); + attr->DecRef(); + } } } @@ -3639,94 +6477,38 @@ void wxGrid::HideCellEditControl() { if ( IsCellEditControlEnabled() ) { - m_cellEditCtrl->Show( FALSE ); - } -} - - -void wxGrid::SetEditControlValue( const wxString& value ) -{ - if ( m_table ) - { - wxString s; - if ( !value ) - s = GetCellValue(m_currentCellCoords); - else - s = value; - - if ( IsCellEditControlEnabled() ) - { - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - ((wxGridTextCtrl *)m_cellEditCtrl)->SetStartValue(s); - break; - - case wxGRID_CHECKBOX: - // TODO: implement this - // - break; - - case wxGRID_CHOICE: - // TODO: implement this - // - break; + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - case wxGRID_COMBOBOX: - // TODO: implement this - // - break; - } - } + 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::SaveEditControlValue() { - if ( m_table ) + if ( IsCellEditControlEnabled() ) { - wxWindow *ctrl = (wxWindow *)NULL; - - if ( IsCellEditControlEnabled() ) - { - ctrl = m_cellEditCtrl; - } - else - { - return; - } - - bool valueChanged = FALSE; - - switch ( m_editCtrlType ) - { - case wxGRID_TEXTCTRL: - valueChanged = (((wxGridTextCtrl *)ctrl)->GetValue() != - ((wxGridTextCtrl *)ctrl)->GetStartValue()); - SetCellValue( m_currentCellCoords, - ((wxTextCtrl *) ctrl)->GetValue() ); - break; - - case wxGRID_CHECKBOX: - // TODO: implement this - // - break; + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); - case wxGRID_CHOICE: - // TODO: implement this - // - break; + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(this, row, col); + bool changed = editor->EndEdit(row, col, this); - case wxGRID_COMBOBOX: - // TODO: implement this - // - break; - } + editor->DecRef(); + attr->DecRef(); - if ( valueChanged ) + if (changed) { - SendEvent( EVT_GRID_CELL_CHANGE, + SendEvent( wxEVT_GRID_CELL_CHANGE, m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol() ); } @@ -3763,7 +6545,8 @@ 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 -1; @@ -3776,7 +6559,8 @@ 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 -1; @@ -3792,12 +6576,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; } } @@ -3814,12 +6597,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; } } @@ -3834,12 +6616,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; } @@ -3912,10 +6699,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 @@ -3934,10 +6723,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 @@ -3959,17 +6750,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; } @@ -3977,19 +6784,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; } @@ -3997,17 +6818,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; } @@ -4015,17 +6852,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; } @@ -4043,7 +6896,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 ) { @@ -4073,7 +6926,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 ) { @@ -4093,7 +6946,7 @@ bool wxGrid::MovePageDown() return FALSE; } -bool wxGrid::MoveCursorUpBlock() +bool wxGrid::MoveCursorUpBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -4140,15 +6993,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 && @@ -4195,7 +7056,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; } @@ -4203,7 +7073,7 @@ bool wxGrid::MoveCursorDownBlock() return FALSE; } -bool wxGrid::MoveCursorLeftBlock() +bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -4250,7 +7120,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; } @@ -4258,7 +7137,7 @@ bool wxGrid::MoveCursorLeftBlock() return FALSE; } -bool wxGrid::MoveCursorRightBlock() +bool wxGrid::MoveCursorRightBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -4305,7 +7184,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; } @@ -4449,12 +7337,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; } @@ -4467,12 +7370,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; } @@ -4494,7 +7412,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 ); } @@ -4513,7 +7431,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 ); } @@ -4533,6 +7451,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 ) @@ -4565,7 +7498,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() @@ -4577,7 +7510,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); } // ============================================================================ @@ -4591,23 +7524,35 @@ 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 ) { - m_gridWin->SetForegroundColour(col); + m_defaultCellAttr->SetTextColour(col); } void wxGrid::SetDefaultCellAlignment( int horiz, int vert ) { - m_defaultCellHAlign = horiz; - m_defaultCellVAlign = vert; + m_defaultCellAttr->SetAlignment(horiz, vert); } void wxGrid::SetDefaultCellFont( const wxFont& font ) { - m_defaultCellFont = font; + m_defaultCellAttr->SetFont(font); +} + +void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) +{ + m_defaultCellAttr->SetRenderer(renderer); +} + +void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) +{ + m_defaultCellAttr->SetEditor(editor); } // ---------------------------------------------------------------------------- @@ -4616,116 +7561,97 @@ void wxGrid::SetDefaultCellFont( const wxFont& font ) wxColour wxGrid::GetDefaultCellBackgroundColour() { - return m_gridWin->GetBackgroundColour(); + return m_defaultCellAttr->GetBackgroundColour(); } wxColour wxGrid::GetDefaultCellTextColour() { - return m_gridWin->GetForegroundColour(); + return m_defaultCellAttr->GetTextColour(); } wxFont wxGrid::GetDefaultCellFont() { - return m_defaultCellFont; + return m_defaultCellAttr->GetFont(); } void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) { - if ( horiz ) - *horiz = m_defaultCellHAlign; - if ( vert ) - *vert = m_defaultCellVAlign; + m_defaultCellAttr->GetAlignment(horiz, vert); } -wxGridCellRenderer *wxGrid::GetCellRenderer(int row, int col) +wxGridCellRenderer *wxGrid::GetDefaultRenderer() const { - wxGridCellRenderer *renderer = (wxGridCellRenderer *)NULL; - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; - if ( attr ) - { - renderer = attr->GetRenderer(); - - attr->DecRef(); - } - - if ( !renderer ) - { - if ( !m_defaultRenderer ) - { - m_defaultRenderer = new wxGridCellStringRenderer; - } - - renderer = m_defaultRenderer; - } + return m_defaultCellAttr->GetRenderer(NULL, 0, 0); +} - return renderer; +wxGridCellEditor *wxGrid::GetDefaultEditor() const +{ + return m_defaultCellAttr->GetEditor(NULL,0,0); } // ---------------------------------------------------------------------------- // access to cell attributes // ---------------------------------------------------------------------------- -// TODO VZ: we must cache the attr to allow only retrieveing it once! - wxColour wxGrid::GetCellBackgroundColour(int row, int col) { - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; - - wxColour colour; - if ( attr && attr->HasBackgroundColour() ) - colour = attr->GetBackgroundColour(); - else - colour = GetDefaultCellBackgroundColour(); - - attr->SafeDecRef(); - + wxGridCellAttr *attr = GetCellAttr(row, col); + wxColour colour = attr->GetBackgroundColour(); + attr->DecRef(); return colour; } wxColour wxGrid::GetCellTextColour( int row, int col ) { - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; - - wxColour colour; - if ( attr && attr->HasTextColour() ) - colour = attr->GetTextColour(); - else - colour = GetDefaultCellTextColour(); - - attr->SafeDecRef(); - + wxGridCellAttr *attr = GetCellAttr(row, col); + wxColour colour = attr->GetTextColour(); + attr->DecRef(); return colour; } wxFont wxGrid::GetCellFont( int row, int col ) { - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; + wxGridCellAttr *attr = GetCellAttr(row, col); + wxFont font = attr->GetFont(); + attr->DecRef(); + return font; +} - wxFont font; - if ( attr && attr->HasFont() ) - font = attr->GetFont(); - else - font = GetDefaultCellFont(); +void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + attr->GetAlignment(horiz, vert); + attr->DecRef(); +} - attr->SafeDecRef(); +wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); + attr->DecRef(); - return font; + return renderer; } -void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) +wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) { - wxGridCellAttr *attr = m_table ? m_table->GetAttr(row, col) : NULL; + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(this, row, col); + attr->DecRef(); - if ( attr && attr->HasAlignment() ) - attr->GetAlignment(horiz, vert); - else - GetDefaultCellAlignment(horiz, vert); + return editor; +} - attr->SafeDecRef(); +bool wxGrid::IsReadOnly(int row, int col) const +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + bool isReadOnly = attr->IsReadOnly(); + attr->DecRef(); + return isReadOnly; } // ---------------------------------------------------------------------------- -// setting cell attributes: this is forwarded to the table +// attribute support: cache, automatic provider creation, ... // ---------------------------------------------------------------------------- bool wxGrid::CanHaveAttributes() @@ -4735,38 +7661,164 @@ bool wxGrid::CanHaveAttributes() return FALSE; } - if ( !m_table->GetAttrProvider() ) + return m_table->CanHaveAttributes(); +} + +void wxGrid::ClearAttrCache() +{ + if ( m_attrCache.row != -1 ) { - // 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); + wxSafeDecRef(m_attrCache.attr); + m_attrCache.row = -1; } +} - return TRUE; +void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const +{ + wxGrid *self = (wxGrid *)this; // const_cast + + self->ClearAttrCache(); + self->m_attrCache.row = row; + self->m_attrCache.col = col; + self->m_attrCache.attr = attr; + wxSafeIncRef(attr); } -wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const +bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const { - wxGridCellAttr *attr = m_table->GetAttr(row, col); - if ( !attr ) + if ( row == m_attrCache.row && col == m_attrCache.col ) { - attr = new wxGridCellAttr; + *attr = m_attrCache.attr; + wxSafeIncRef(m_attrCache.attr); - // artificially inc the ref count to match DecRef() in caller - attr->IncRef(); +#ifdef DEBUG_ATTR_CACHE + gs_nAttrCacheHits++; +#endif + + return TRUE; + } + else + { +#ifdef DEBUG_ATTR_CACHE + gs_nAttrCacheMisses++; +#endif + return FALSE; + } +} - m_table->SetAttr(attr, row, col); +wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const +{ + wxGridCellAttr *attr; + if ( !LookupAttr(row, col, &attr) ) + { + attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL; + CacheAttr(row, col, attr); + } + if (attr) + { + attr->SetDefAttr(m_defaultCellAttr); + } + else + { + attr = m_defaultCellAttr; + attr->IncRef(); } return attr; } +wxGridCellAttr *wxGrid::GetOrCreateCellAttr(int row, int col) const +{ + wxGridCellAttr *attr; + if ( !LookupAttr(row, col, &attr) || !attr ) + { + wxASSERT_MSG( m_table, + _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") ); + + attr = m_table->GetAttr(row, col); + if ( !attr ) + { + attr = new wxGridCellAttr; + + // artificially inc the ref count to match DecRef() in caller + attr->IncRef(); + + m_table->SetAttr(attr, row, col); + } + + CacheAttr(row, col, attr); + } + attr->SetDefAttr(m_defaultCellAttr); + return attr; +} + +// ---------------------------------------------------------------------------- +// 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 +// ---------------------------------------------------------------------------- + +void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) +{ + if ( CanHaveAttributes() ) + { + m_table->SetRowAttr(attr, row); + } + else + { + wxSafeDecRef(attr); + } +} + +void wxGrid::SetColAttr(int col, wxGridCellAttr *attr) +{ + if ( CanHaveAttributes() ) + { + m_table->SetColAttr(attr, col); + } + else + { + wxSafeDecRef(attr); + } +} + void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour ) { if ( CanHaveAttributes() ) { - wxGridCellAttr *attr = GetCellAttr(row, col); + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); attr->SetBackgroundColour(colour); attr->DecRef(); } @@ -4776,7 +7828,7 @@ void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour ) { if ( CanHaveAttributes() ) { - wxGridCellAttr *attr = GetCellAttr(row, col); + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); attr->SetTextColour(colour); attr->DecRef(); } @@ -4786,7 +7838,7 @@ void wxGrid::SetCellFont( int row, int col, const wxFont& font ) { if ( CanHaveAttributes() ) { - wxGridCellAttr *attr = GetCellAttr(row, col); + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); attr->SetFont(font); attr->DecRef(); } @@ -4796,7 +7848,7 @@ void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert ) { if ( CanHaveAttributes() ) { - wxGridCellAttr *attr = GetCellAttr(row, col); + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); attr->SetAlignment(horiz, vert); attr->DecRef(); } @@ -4806,30 +7858,114 @@ void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) { if ( CanHaveAttributes() ) { - wxGridCellAttr *attr = GetCellAttr(row, col); + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); attr->SetRenderer(renderer); attr->DecRef(); } } +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(); } } @@ -4838,12 +7974,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; @@ -4857,14 +7998,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(); } } @@ -4873,12 +8008,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; @@ -4887,339 +8029,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; - - wxCoord oldLeft = m_selectedTopLeft.GetCol(); - wxCoord oldTop = m_selectedTopLeft.GetRow(); - wxCoord oldRight = m_selectedBottomRight.GetCol(); - wxCoord oldBottom = m_selectedBottomRight.GetRow(); + int width = m_rowLabelWidth; - 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(); } @@ -5261,6 +8331,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) ); @@ -5278,7 +8351,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 ) { @@ -5286,6 +8359,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; @@ -5319,11 +8393,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; @@ -5334,4 +8410,3 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec #endif // ifndef wxUSE_NEW_GRID -