X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60ff3b9976b7d84895f42b4136195612c3a03cb5..7f017c64bbad70dac236202cf208889f08f75a8c:/src/generic/grid.cpp diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 623b368809..6a9750f96f 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,91 +39,2649 @@ #include "wx/dcclient.h" #include "wx/settings.h" #include "wx/log.h" - #include "wx/sizer.h" + #include "wx/textctrl.h" + #include "wx/checkbox.h" + #include "wx/combobox.h" + #include "wx/valtext.h" #endif -#include "wx/generic/grid.h" +#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 -wxGridCellCoords wxGridNoCellCoords( -1, -1 ); -wxRect wxGridNoCellRect( -1, -1, -1, -1 ); +#if defined(__WXGTK__) + #define WXUNUSED_GTK(identifier) WXUNUSED(identifier) +#else + #define WXUNUSED_GTK(identifier) identifier +#endif + +// Required for wxIs... functions +#include + +// ---------------------------------------------------------------------------- +// array classes +// ---------------------------------------------------------------------------- + +WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs); + +struct wxGridCellWithAttr +{ + wxGridCellWithAttr(int row, int col, wxGridCellAttr *attr_) + : coords(row, col), attr(attr_) + { + } + + ~wxGridCellWithAttr() + { + attr->DecRef(); + } + + wxGridCellCoords coords; + wxGridCellAttr *attr; +}; + +WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); -// this is a magic incantation which must be done! #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxGridCellCoordsArray) +WX_DEFINE_OBJARRAY(wxGridCellWithAttrArray) +// ---------------------------------------------------------------------------- +// events +// ---------------------------------------------------------------------------- -////////////////////////////////////////////////////////////////////// -// -// Abstract base class for grid data (the model) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_LABEL_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_GRID_ROW_SIZE) +DEFINE_EVENT_TYPE(wxEVT_GRID_COL_SIZE) +DEFINE_EVENT_TYPE(wxEVT_GRID_RANGE_SELECT) +DEFINE_EVENT_TYPE(wxEVT_GRID_CELL_CHANGE) +DEFINE_EVENT_TYPE(wxEVT_GRID_SELECT_CELL) +DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_SHOWN) +DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_HIDDEN) +DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED) + +// ---------------------------------------------------------------------------- +// private classes +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxGridRowLabelWindow : public wxWindow +{ +public: + wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridRowLabelWindow( wxGrid *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size ); + +private: + wxGrid *m_owner; + + void OnPaint( wxPaintEvent& event ); + void OnMouseEvent( wxMouseEvent& event ); + void OnMouseWheel( wxMouseEvent& event ); + void OnKeyDown( wxKeyEvent& event ); + void OnKeyUp( wxKeyEvent& ); + + DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow) + DECLARE_EVENT_TABLE() +}; + + +class WXDLLEXPORT wxGridColLabelWindow : public wxWindow +{ +public: + wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridColLabelWindow( wxGrid *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size ); + +private: + wxGrid *m_owner; + + void OnPaint( wxPaintEvent &event ); + void OnMouseEvent( wxMouseEvent& event ); + void OnMouseWheel( wxMouseEvent& event ); + void OnKeyDown( wxKeyEvent& event ); + void OnKeyUp( wxKeyEvent& ); + + DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow) + DECLARE_EVENT_TABLE() +}; + + +class WXDLLEXPORT wxGridCornerLabelWindow : public wxWindow +{ +public: + wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; } + wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size ); + +private: + wxGrid *m_owner; + + void OnMouseEvent( wxMouseEvent& event ); + void OnMouseWheel( wxMouseEvent& event ); + void OnKeyDown( wxKeyEvent& event ); + void OnKeyUp( wxKeyEvent& ); + void OnPaint( wxPaintEvent& event ); + + DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow) + DECLARE_EVENT_TABLE() +}; + +class WXDLLEXPORT wxGridWindow : public wxPanel +{ +public: + wxGridWindow() + { + m_owner = (wxGrid *)NULL; + m_rowLabelWin = (wxGridRowLabelWindow *)NULL; + m_colLabelWin = (wxGridColLabelWindow *)NULL; + } + + wxGridWindow( wxGrid *parent, + wxGridRowLabelWindow *rowLblWin, + wxGridColLabelWindow *colLblWin, + wxWindowID id, const wxPoint &pos, const wxSize &size ); + ~wxGridWindow(); + + void ScrollWindow( int dx, int dy, const wxRect *rect ); + +private: + wxGrid *m_owner; + wxGridRowLabelWindow *m_rowLabelWin; + wxGridColLabelWindow *m_colLabelWin; + + void OnPaint( wxPaintEvent &event ); + void OnMouseWheel( wxMouseEvent& 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 +// ---------------------------------------------------------------------------- + +// this class stores attributes set for cells +class WXDLLEXPORT wxGridCellAttrData +{ +public: + void SetAttr(wxGridCellAttr *attr, int row, int col); + wxGridCellAttr *GetAttr(int row, int col) const; + void UpdateAttrRows( size_t pos, int numRows ); + void UpdateAttrCols( size_t pos, int numCols ); + +private: + // searches for the attr for given cell, returns wxNOT_FOUND if not found + int FindIndex(int row, int col) const; + + wxGridCellWithAttrArray m_attrs; +}; + +// this class stores attributes set for rows or columns +class WXDLLEXPORT wxGridRowOrColAttrData +{ +public: + // 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 +// ---------------------------------------------------------------------------- + +#ifndef WXGRID_DRAW_LINES +#define WXGRID_DRAW_LINES 1 +#endif + +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +//#define DEBUG_ATTR_CACHE +#ifdef DEBUG_ATTR_CACHE + static size_t gs_nAttrCacheHits = 0; + static size_t gs_nAttrCacheMisses = 0; +#endif // DEBUG_ATTR_CACHE + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +wxGridCellCoords wxGridNoCellCoords( -1, -1 ); +wxRect wxGridNoCellRect( -1, -1, -1, -1 ); + +// scroll line size +// TODO: this doesn't work at all, grid cells have different sizes and approx +// calculations don't work as because of the size mismatch scrollbars +// sometimes fail to be shown when they should be or vice versa // -IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject ) +// The scroll bars may be a little flakey once in a while, but that is +// surely much less horrible than having scroll lines of only 1!!! +// -- Robin +static const size_t GRID_SCROLL_LINE = 15; // 1; + + +// the size of hash tables used a bit everywhere (the max number of elements +// in these hash tables is the number of rows/columns) +static const int GRID_HASH_SIZE = 100; + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxGridCellEditor +// ---------------------------------------------------------------------------- + +wxGridCellEditor::wxGridCellEditor() +{ + m_control = NULL; +} + + +wxGridCellEditor::~wxGridCellEditor() +{ + Destroy(); +} + +void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent), + wxWindowID WXUNUSED(id), + wxEvtHandler* evtHandler) +{ + if ( evtHandler ) + m_control->PushEventHandler(evtHandler); +} + +void wxGridCellEditor::PaintBackground(const wxRect& rectCell, + wxGridCellAttr *attr) +{ + // erase the background because we might not fill the cell + wxClientDC dc(m_control->GetParent()); + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID)); + dc.DrawRectangle(rectCell); + + // redraw the control we just painted over + m_control->Refresh(); +} + +void wxGridCellEditor::Destroy() +{ + if (m_control) + { + m_control->PopEventHandler(TRUE /* delete it*/); + + m_control->Destroy(); + m_control = NULL; + } +} + +void wxGridCellEditor::Show(bool show, wxGridCellAttr *attr) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + m_control->Show(show); + + if ( show ) + { + // set the colours/fonts if we have any + if ( attr ) + { + m_colFgOld = m_control->GetForegroundColour(); + m_control->SetForegroundColour(attr->GetTextColour()); + + m_colBgOld = m_control->GetBackgroundColour(); + m_control->SetBackgroundColour(attr->GetBackgroundColour()); + + m_fontOld = m_control->GetFont(); + m_control->SetFont(attr->GetFont()); + + // can't do anything more in the base class version, the other + // attributes may only be used by the derived classes + } + } + else + { + // restore the standard colours fonts + if ( m_colFgOld.Ok() ) + { + m_control->SetForegroundColour(m_colFgOld); + m_colFgOld = wxNullColour; + } + + if ( m_colBgOld.Ok() ) + { + m_control->SetBackgroundColour(m_colBgOld); + m_colBgOld = wxNullColour; + } + + if ( m_fontOld.Ok() ) + { + m_control->SetFont(m_fontOld); + m_fontOld = wxNullFont; + } + } +} + +void wxGridCellEditor::SetSize(const wxRect& rect) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE); +} + +void wxGridCellEditor::HandleReturn(wxKeyEvent& event) +{ + event.Skip(); +} + +bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event) +{ + // accept the simple key presses, not anything with Ctrl/Alt/Meta + return !(event.ControlDown() || event.AltDown()); +} + +void wxGridCellEditor::StartingKey(wxKeyEvent& event) +{ + event.Skip(); +} + +void wxGridCellEditor::StartingClick() +{ +} + +// ---------------------------------------------------------------------------- +// wxGridCellTextEditor +// ---------------------------------------------------------------------------- + +wxGridCellTextEditor::wxGridCellTextEditor() +{ + m_maxChars = 0; +} + +void wxGridCellTextEditor::Create(wxWindow* parent, + wxWindowID id, + wxEvtHandler* evtHandler) +{ + m_control = new wxTextCtrl(parent, id, wxEmptyString, + wxDefaultPosition, wxDefaultSize +#if defined(__WXMSW__) + , wxTE_PROCESS_TAB | wxTE_MULTILINE | + wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL +#endif + ); + + // TODO: use m_maxChars + + wxGridCellEditor::Create(parent, id, evtHandler); +} + +void wxGridCellTextEditor::PaintBackground(const wxRect& WXUNUSED(rectCell), + wxGridCellAttr * WXUNUSED(attr)) +{ + // as we fill the entire client area, don't do anything here to minimize + // flicker +} + +void wxGridCellTextEditor::SetSize(const wxRect& rectOrig) +{ + wxRect rect(rectOrig); + + // Make the edit control large enough to allow for internal + // margins + // + // TODO: remove this if the text ctrl sizing is improved esp. for + // unix + // +#if defined(__WXGTK__) + if (rect.x != 0) + { + rect.x += 1; + rect.y += 1; + rect.width -= 1; + rect.height -= 1; + } +#else // !GTK + int extra_x = ( rect.x > 2 )? 2 : 1; + +// MB: treat MSW separately here otherwise the caret doesn't show +// when the editor is in the first row. +#if defined(__WXMSW__) + int extra_y = 2; +#else + int extra_y = ( rect.y > 2 )? 2 : 1; +#endif // MSW + +#if defined(__WXMOTIF__) + extra_x *= 2; + extra_y *= 2; +#endif + rect.SetLeft( wxMax(0, rect.x - extra_x) ); + rect.SetTop( wxMax(0, rect.y - extra_y) ); + rect.SetRight( rect.GetRight() + 2*extra_x ); + rect.SetBottom( rect.GetBottom() + 2*extra_y ); +#endif // GTK/!GTK + + wxGridCellEditor::SetSize(rect); +} + +void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + m_startValue = grid->GetTable()->GetValue(row, col); + + DoBeginEdit(m_startValue); +} + +void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue) +{ + Text()->SetValue(startValue); + Text()->SetInsertionPointEnd(); + Text()->SetFocus(); +} + +bool wxGridCellTextEditor::EndEdit(int row, int col, + wxGrid* grid) +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + bool changed = FALSE; + wxString value = Text()->GetValue(); + if (value != m_startValue) + changed = TRUE; + + if (changed) + grid->GetTable()->SetValue(row, col, value); + + m_startValue = wxEmptyString; + Text()->SetValue(m_startValue); + + return changed; +} + + +void wxGridCellTextEditor::Reset() +{ + wxASSERT_MSG(m_control, + wxT("The wxGridCellEditor must be Created first!")); + + DoReset(m_startValue); +} + +void wxGridCellTextEditor::DoReset(const wxString& startValue) +{ + Text()->SetValue(startValue); + Text()->SetInsertionPointEnd(); +} + +bool wxGridCellTextEditor::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_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; +} + +void wxGridCellTextEditor::StartingKey(wxKeyEvent& event) +{ + // we don't check for !HasModifiers() because IsAcceptedKey() did it + + // insert the key in the control + wxChar ch; + int keycode = event.GetKeyCode(); + switch ( keycode ) + { + case WXK_NUMPAD0: + case WXK_NUMPAD1: + case WXK_NUMPAD2: + case WXK_NUMPAD3: + case WXK_NUMPAD4: + case WXK_NUMPAD5: + case WXK_NUMPAD6: + case WXK_NUMPAD7: + case WXK_NUMPAD8: + case WXK_NUMPAD9: + ch = _T('0') + keycode - WXK_NUMPAD0; + break; + + case WXK_MULTIPLY: + case WXK_NUMPAD_MULTIPLY: + ch = _T('*'); + break; + + case WXK_ADD: + case WXK_NUMPAD_ADD: + ch = _T('+'); + break; + + case WXK_SUBTRACT: + case WXK_NUMPAD_SUBTRACT: + ch = _T('-'); + break; + + case WXK_DECIMAL: + case WXK_NUMPAD_DECIMAL: + ch = _T('.'); + break; + + case WXK_DIVIDE: + case WXK_NUMPAD_DIVIDE: + ch = _T('/'); + break; + + default: + if ( keycode < 256 && keycode >= 0 && isprint(keycode) ) + { + // FIXME this is not going to work for non letters... + if ( !event.ShiftDown() ) + { + keycode = tolower(keycode); + } + + ch = (wxChar)keycode; + } + else + { + ch = _T('\0'); + } + } + + if ( ch ) + { + Text()->AppendText(ch); + } + else + { + event.Skip(); + } +} + +void wxGridCellTextEditor::HandleReturn( wxKeyEvent& + 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: + m_grid->GetEventHandler()->ProcessEvent( event ); + break; + + case WXK_RETURN: + case WXK_NUMPAD_ENTER: + if (!m_grid->GetEventHandler()->ProcessEvent(event)) + m_editor->HandleReturn(event); + break; + + + default: + event.Skip(); + } +} + +void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event) +{ + switch ( event.KeyCode() ) + { + case WXK_ESCAPE: + case WXK_TAB: + case WXK_RETURN: + case WXK_NUMPAD_ENTER: + break; + + default: + event.Skip(); + } +} + +// ---------------------------------------------------------------------------- +// wxGridCellWorker is an (almost) empty common base class for +// wxGridCellRenderer and wxGridCellEditor managing ref counting +// ---------------------------------------------------------------------------- + +void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params)) +{ + // nothing to do +} + +wxGridCellWorker::~wxGridCellWorker() +{ +} + +// ============================================================================ +// renderer classes +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxGridCellRenderer +// ---------------------------------------------------------------------------- + +void wxGridCellRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rect, + int WXUNUSED(row), int WXUNUSED(col), + bool isSelected) +{ + dc.SetBackgroundMode( wxSOLID ); + + if ( isSelected ) + { + dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) ); + } + else + { + dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) ); + } + + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.DrawRectangle(rect); +} + +// ---------------------------------------------------------------------------- +// wxGridCellStringRenderer +// ---------------------------------------------------------------------------- + +void wxGridCellStringRenderer::SetTextColoursAndFont(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + bool isSelected) +{ + dc.SetBackgroundMode( wxTRANSPARENT ); + + // TODO some special colours for attr.IsReadOnly() case? + + if ( isSelected ) + { + dc.SetTextBackground( grid.GetSelectionBackground() ); + dc.SetTextForeground( grid.GetSelectionForeground() ); + } + else + { + dc.SetTextBackground( attr.GetBackgroundColour() ); + dc.SetTextForeground( attr.GetTextColour() ); + } + + dc.SetFont( attr.GetFont() ); +} + +wxSize wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr& attr, + wxDC& dc, + const wxString& text) +{ + wxCoord x = 0, y = 0, max_x = 0; + dc.SetFont(attr.GetFont()); + wxStringTokenizer tk(text, _T('\n')); + while ( tk.HasMoreTokens() ) + { + dc.GetTextExtent(tk.GetNextToken(), &x, &y); + max_x = wxMax(max_x, x); + } + + y *= 1 + text.Freq(wxT('\n')); // multiply by the number of lines. + + return wxSize(max_x, y); +} + +wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + int row, int col) +{ + return DoGetBestSize(attr, dc, grid.GetCellValue(row, col)); +} + +void wxGridCellStringRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rectCell, + int row, int col, + bool isSelected) +{ + wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); + + // now we only have to draw the text + SetTextColoursAndFont(grid, attr, dc, isSelected); + + int hAlign, vAlign; + attr.GetAlignment(&hAlign, &vAlign); + + wxRect rect = rectCell; + rect.Inflate(-1); + + grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), + rect, hAlign, vAlign); +} + +// ---------------------------------------------------------------------------- +// wxGridCellNumberRenderer +// ---------------------------------------------------------------------------- + +wxString wxGridCellNumberRenderer::GetString(wxGrid& grid, int row, int col) +{ + wxGridTableBase *table = grid.GetTable(); + wxString text; + if ( table->CanGetValueAs(row, col, wxGRID_VALUE_NUMBER) ) + { + text.Printf(_T("%ld"), table->GetValueAsLong(row, col)); + } + else + { + text = table->GetValue(row, col); + } + + return text; +} + +void wxGridCellNumberRenderer::Draw(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + const wxRect& rectCell, + int row, int col, + bool isSelected) +{ + wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected); + + SetTextColoursAndFont(grid, attr, dc, isSelected); + + // draw the text right aligned by default + int hAlign, vAlign; + attr.GetAlignment(&hAlign, &vAlign); + hAlign = wxALIGN_RIGHT; + + wxRect rect = rectCell; + rect.Inflate(-1); + + grid.DrawTextRectangle(dc, GetString(grid, row, col), rect, hAlign, vAlign); +} + +wxSize wxGridCellNumberRenderer::GetBestSize(wxGrid& grid, + wxGridCellAttr& attr, + wxDC& dc, + int row, int col) +{ + return DoGetBestSize(attr, dc, GetString(grid, row, col)); +} + +// ---------------------------------------------------------------------------- +// wxGridCellFloatRenderer +// ---------------------------------------------------------------------------- + +wxGridCellFloatRenderer::wxGridCellFloatRenderer(int width, int precision) +{ + SetWidth(width); + SetPrecision(precision); +} + +wxGridCellRenderer *wxGridCellFloatRenderer::Clone() const +{ + wxGridCellFloatRenderer *renderer = new wxGridCellFloatRenderer; + renderer->m_width = m_width; + renderer->m_precision = m_precision; + renderer->m_format = m_format; + + return renderer; +} + +wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col) +{ + wxGridTableBase *table = grid.GetTable(); + + bool hasDouble; + double val; + wxString text; + if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) ) + { + val = table->GetValueAsDouble(row, col); + hasDouble = TRUE; + } + else + { + text = table->GetValue(row, col); + hasDouble = text.ToDouble(&val); + } + + if ( hasDouble ) + { + if ( !m_format ) + { + if ( m_width == -1 ) + { + if ( m_precision == -1 ) + { + // default width/precision + m_format = _T("%f"); + } + else + { + m_format.Printf(_T("%%.%df"), m_precision); + } + } + 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) +{ + if ( !params ) + { + // reset to defaults + SetWidth(-1); + SetPrecision(-1); + } + else + { + wxString tmp = params.BeforeFirst(_T(',')); + if ( !!tmp ) + { + long width; + if ( tmp.ToLong(&width) ) + { + SetWidth((int)width); + } + else + { + wxLogDebug(_T("Invalid wxGridCellFloatRenderer width parameter string '%s ignored"), params.c_str()); + } + + } + tmp = params.AfterFirst(_T(',')); + if ( !!tmp ) + { + long precision; + if ( tmp.ToLong(&precision) ) + { + SetPrecision((int)precision); + } + else + { + wxLogDebug(_T("Invalid wxGridCellFloatRenderer precision 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->SetKind( m_attrkind ); + + attr->SetDefAttr(m_defGridAttr); + + return attr; +} + +void wxGridCellAttr::MergeWith(wxGridCellAttr *mergefrom) +{ + if ( !HasTextColour() && mergefrom->HasTextColour() ) + SetTextColour(mergefrom->GetTextColour()); + if ( !HasBackgroundColour() && mergefrom->HasBackgroundColour() ) + SetBackgroundColour(mergefrom->GetBackgroundColour()); + if ( !HasFont() && mergefrom->HasFont() ) + SetFont(mergefrom->GetFont()); + if ( !!HasAlignment() && mergefrom->HasAlignment() ){ + int hAlign, vAlign; + mergefrom->GetAlignment( &hAlign, &vAlign); + SetAlignment(hAlign, vAlign); + } + + // Directly access member functions as GetRender/Editor don't just return + // m_renderer/m_editor + // + // Maybe add support for merge of Render and Editor? + if (!HasRenderer() && mergefrom->HasRenderer() ) + { + m_renderer = mergefrom->m_renderer; + m_renderer->IncRef(); + } + if ( !HasEditor() && mergefrom->HasEditor() ) + { + m_editor = mergefrom->m_editor; + m_editor->IncRef(); + } + if ( !HasReadWriteMode() && mergefrom->HasReadWriteMode() ) + SetReadOnly(mergefrom->IsReadOnly()); + + SetDefAttr(mergefrom->m_defGridAttr); +} + +const wxColour& wxGridCellAttr::GetTextColour() const +{ + if (HasTextColour()) + { + return m_colText; + } + else if (m_defGridAttr != this) + { + 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, + wxGridCellAttr::wxAttrKind kind ) const +{ + wxGridCellAttr *attr = (wxGridCellAttr *)NULL; + if ( m_data ) + { + switch(kind) + { + case (wxGridCellAttr::Any): + //Get cached merge attributes. + // Currenlty not used as no cache implemented as not mutiable + // attr = m_data->m_mergeAttr.GetAttr(row, col); + if(!attr) + { + //Basicaly implement old version. + //Also check merge cache, so we don't have to re-merge every time.. + wxGridCellAttr *attrcell = (wxGridCellAttr *)NULL, + *attrrow = (wxGridCellAttr *)NULL, + *attrcol = (wxGridCellAttr *)NULL; + + attrcell = m_data->m_cellAttrs.GetAttr(row, col); + attrcol = m_data->m_colAttrs.GetAttr(col); + attrrow = m_data->m_rowAttrs.GetAttr(row); + + if((attrcell != attrrow) && (attrrow !=attrcol) && (attrcell != attrcol)){ + // Two or move are non NULL + attr = new wxGridCellAttr; + attr->SetKind(wxGridCellAttr::Merged); + + //Order important.. + if(attrcell){ + attr->MergeWith(attrcell); + attrcell->DecRef(); + } + if(attrcol){ + attr->MergeWith(attrcol); + attrcol->DecRef(); + } + if(attrrow){ + attr->MergeWith(attrrow); + attrrow->DecRef(); + } + //store merge attr if cache implemented + //attr->IncRef(); + //m_data->m_mergeAttr.SetAttr(attr, row, col); + } + else + { + // one or none is non null return it or null. + if(attrrow) attr = attrrow; + if(attrcol) attr = attrcol; + if(attrcell) attr = attrcell; + } + } + break; + case (wxGridCellAttr::Cell): + attr = m_data->m_cellAttrs.GetAttr(row, col); + break; + case (wxGridCellAttr::Col): + attr = m_data->m_colAttrs.GetAttr(col); + break; + case (wxGridCellAttr::Row): + attr = m_data->m_rowAttrs.GetAttr(row); + break; + default: + // unused as yet... + // (wxGridCellAttr::Default): + // (wxGridCellAttr::Merged): + break; + } + } + return attr; +} + +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; + if (renderer) + renderer->IncRef(); + return renderer; +} + +wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index) +{ + wxGridCellEditor* editor = m_typeinfo[index]->m_editor; + if (editor) + editor->IncRef(); + return editor; +} + +// ---------------------------------------------------------------------------- +// wxGridTableBase +// ---------------------------------------------------------------------------- + +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, wxGridCellAttr::wxAttrKind kind) +{ + if ( m_attrProvider ) + return m_attrProvider->GetAttr(row, col, kind); + else + return (wxGridCellAttr *)NULL; +} -wxGridTableBase::wxGridTableBase() - : wxObject() +void wxGridTableBase::SetAttr(wxGridCellAttr* attr, int row, int col) { - m_view = (wxGrid *) NULL; + if ( m_attrProvider ) + { + attr->SetKind(wxGridCellAttr::Cell); + 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); + } } -wxGridTableBase::~wxGridTableBase() +void wxGridTableBase::SetRowAttr(wxGridCellAttr *attr, int row) { + if ( m_attrProvider ) + { + attr->SetKind(wxGridCellAttr::Row); + 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 ) + { + attr->SetKind(wxGridCellAttr::Col); + 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 pos, size_t numRows ) +bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos), + size_t WXUNUSED(numRows) ) { - wxLogWarning( wxT("Called grid table class function InsertRows(pos=%d, N=%d)\n" - "but your derived table class does not override this function"), - pos, numRows ); + wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") ); return FALSE; } -bool wxGridTableBase::AppendRows( size_t numRows ) +bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) ) { - wxLogWarning( wxT("Called grid table class function AppendRows(N=%d)\n" - "but your derived table class does not override this function"), - numRows ); + wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function")); return FALSE; } -bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows ) +bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos), + size_t WXUNUSED(numRows) ) { - wxLogWarning( wxT("Called grid table class function DeleteRows(pos=%d, N=%d)\n" - "but your derived table class does not override this function"), - pos, numRows ); + wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function")); return FALSE; } -bool wxGridTableBase::InsertCols( size_t pos, size_t numCols ) +bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos), + size_t WXUNUSED(numCols) ) { - wxLogWarning( wxT("Called grid table class function InsertCols(pos=%d, N=%d)\n" - "but your derived table class does not override this function"), - pos, numCols ); + wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function")); return FALSE; } -bool wxGridTableBase::AppendCols( size_t numCols ) +bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) ) { - wxLogWarning( wxT("Called grid table class function AppendCols(N=%d)\n" - "but your derived table class does not override this function"), - numCols ); + wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function")); return FALSE; } -bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols ) +bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos), + size_t WXUNUSED(numCols) ) { - wxLogWarning( wxT("Called grid table class function DeleteCols(pos=%d, N=%d)\n" - "but your derived table class does not override this function"), - pos, numCols ); + wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function")); return FALSE; } @@ -124,7 +2690,8 @@ bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols ) wxString wxGridTableBase::GetRowLabelValue( int row ) { wxString s; - s << row; + s << row + 1; // RD: Starting the rows at zero confuses users, no matter + // how much it makes sense to us geeks. return s; } @@ -139,7 +2706,7 @@ wxString wxGridTableBase::GetColLabelValue( int col ) unsigned int i, n; for ( n = 1; ; n++ ) { - s += ('A' + (char)( col%26 )); + s += (_T('A') + (wxChar)( col%26 )); col = col/26 - 1; if ( col < 0 ) break; } @@ -155,6 +2722,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) ) +{ +} ////////////////////////////////////////////////////////////////////// // @@ -220,12 +2845,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(); @@ -235,26 +2860,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; @@ -281,7 +2908,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 ) { @@ -299,7 +2927,6 @@ bool wxGridStringTable::InsertRows( size_t pos, size_t numRows ) { m_data.Insert( sa, row ); } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -318,7 +2945,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 ) @@ -355,9 +2983,10 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) if ( pos >= curNumRows ) { - wxLogError( wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)...\n" - "Pos value is invalid for present table with %d rows"), - pos, numRows, curNumRows ); + wxString errmsg; + errmsg.Printf(wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\nPos value is invalid for present table with %d rows"), + pos, numRows, curNumRows ); + wxFAIL_MSG( errmsg ); return FALSE; } @@ -377,7 +3006,6 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows ) m_data.Remove( pos ); } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -396,7 +3024,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 ) { @@ -410,7 +3039,6 @@ bool wxGridStringTable::InsertCols( size_t pos, size_t numCols ) m_data[row].Insert( wxEmptyString, col ); } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -429,14 +3057,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 ? // - wxLogError( wxT("Unable to append cols to a grid table with no rows.\n" - "Call AppendRows() first") ); + wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") ); return FALSE; } +#endif for ( row = 0; row < curNumRows; row++ ) { @@ -463,13 +3092,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 ) { - wxLogError( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n" - "Pos value is invalid for present table with %d cols"), - pos, numCols, curNumCols ); + wxString errmsg; + errmsg.Printf( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\nPos value is invalid for present table with %d cols"), + pos, numCols, curNumCols ); + wxFAIL_MSG( errmsg ); return FALSE; } @@ -492,7 +3123,6 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols ) } } } - if ( GetView() ) { wxGridTableMessage msg( this, @@ -566,113 +3196,28 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value ) - ////////////////////////////////////////////////////////////////////// - -IMPLEMENT_DYNAMIC_CLASS( wxGridTextCtrl, wxTextCtrl ) - -BEGIN_EVENT_TABLE( wxGridTextCtrl, wxTextCtrl ) - EVT_KEY_DOWN( wxGridTextCtrl::OnKeyDown ) -END_EVENT_TABLE() - - -wxGridTextCtrl::wxGridTextCtrl( wxWindow *par, - wxGrid *grid, - bool isCellControl, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style ) - : wxTextCtrl( par, id, value, pos, size, style ) -{ - m_grid = grid; - m_isCellControl = isCellControl; -} - - -void wxGridTextCtrl::OnKeyDown( wxKeyEvent& event ) -{ - switch ( event.KeyCode() ) - { - case WXK_ESCAPE: - m_grid->SetEditControlValue( startValue ); - SetInsertionPointEnd(); - break; - - case WXK_UP: - case WXK_DOWN: - case WXK_LEFT: - case WXK_RIGHT: - case WXK_PRIOR: - case WXK_NEXT: - case WXK_RETURN: - 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_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(); - } -} - -void wxGridTextCtrl::SetStartValue( const wxString& s ) -{ - startValue = s; - wxTextCtrl::SetValue( s.c_str() ); -} - - - ////////////////////////////////////////////////////////////////////// IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow ) BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow ) EVT_PAINT( wxGridRowLabelWindow::OnPaint ) + EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel) EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown ) + EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp ) 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); @@ -682,12 +3227,12 @@ void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event ) // // m_owner->PrepareDC( dc ); - wxCoord x, y; + int x, y; m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); dc.SetDeviceOrigin( 0, -y ); - m_owner->CalcRowLabelsExposed( GetUpdateRegion() ); - m_owner->DrawRowLabels( dc ); + wxArrayInt rows = m_owner->CalcRowLabelsExposed( GetUpdateRegion() ); + m_owner->DrawRowLabels( dc , rows ); } @@ -697,12 +3242,23 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event ) } +void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event ) +{ + m_owner->GetEventHandler()->ProcessEvent(event); +} + + // This seems to be required for wxMotif otherwise the mouse // cursor must be in the cell edit control to get key events // void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); +} + +void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -713,19 +3269,21 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow ) BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow ) EVT_PAINT( wxGridColLabelWindow::OnPaint ) + EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel) EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent ) EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown ) + EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp ) 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); @@ -735,12 +3293,12 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent &event ) // // m_owner->PrepareDC( dc ); - wxCoord x, y; + int x, y; m_owner->CalcUnscrolledPosition( 0, 0, &x, &y ); dc.SetDeviceOrigin( -x, 0 ); - m_owner->CalcColLabelsExposed( GetUpdateRegion() ); - m_owner->DrawColLabels( dc ); + wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() ); + m_owner->DrawColLabels( dc , cols ); } @@ -749,13 +3307,23 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event ) m_owner->ProcessColLabelMouseEvent( event ); } +void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event ) +{ + m_owner->GetEventHandler()->ProcessEvent(event); +} + // This seems to be required for wxMotif otherwise the mouse // cursor must be in the cell edit control to get key events // void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); +} + +void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -765,18 +3333,38 @@ void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event ) IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow ) BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow ) + EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel) EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent ) + EVT_PAINT( wxGridCornerLabelWindow::OnPaint) EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown ) + 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, wxRAISED_BORDER ) + : wxWindow( parent, id, pos, size, wxWANTS_CHARS ) { m_owner = parent; } +void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) ) +{ + wxPaintDC dc(this); + + int client_height = 0; + int client_width = 0; + GetClientSize( &client_width, &client_height ); + + dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( client_width-1, client_height-1, client_width-1, 0 ); + dc.DrawLine( client_width-1, client_height-1, 0, client_height-1 ); + + dc.SetPen( *wxWHITE_PEN ); + dc.DrawLine( 0, 0, client_width, 0 ); + dc.DrawLine( 0, 0, 0, client_height ); +} + void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) { @@ -784,12 +3372,22 @@ void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event ) } +void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event ) +{ + m_owner->GetEventHandler()->ProcessEvent(event); +} + // This seems to be required for wxMotif otherwise the mouse // cursor must be in the cell edit control to get key events // void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); +} + +void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); } @@ -800,21 +3398,22 @@ IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxPanel ) BEGIN_EVENT_TABLE( wxGridWindow, wxPanel ) EVT_PAINT( wxGridWindow::OnPaint ) - EVT_SCROLLWIN( wxGridWindow::ScrollWindow ) + EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel) 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, wxSUNKEN_BORDER, "grid window" ) + : wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" ) { m_owner = parent; m_rowLabelWin = rowLblWin; m_colLabelWin = colLblWin; - SetBackgroundColour( "WHITE" ); } @@ -828,9 +3427,14 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc( this ); m_owner->PrepareDC( dc ); - - m_owner->CalcCellsExposed( GetUpdateRegion() ); - m_owner->DrawGridCellArea( dc ); + wxRegion reg = GetUpdateRegion(); + wxGridCellCoordsArray DirtyCells = m_owner->CalcCellsExposed( reg ); + m_owner->DrawGridCellArea( dc , DirtyCells); +#if WXGRID_DRAW_LINES + m_owner->DrawAllGridLines( dc, reg ); +#endif + m_owner->DrawGridSpace( dc ); + m_owner->DrawHighlight( dc , DirtyCells ); } @@ -847,25 +3451,40 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event ) m_owner->ProcessGridCellMouseEvent( event ); } +void wxGridWindow::OnMouseWheel( wxMouseEvent& event ) +{ + m_owner->GetEventHandler()->ProcessEvent(event); +} -// This seems to be required for wxMotif 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 ) { - if ( !m_owner->ProcessEvent( event ) ) event.Skip(); + if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip(); +} + +void wxGridWindow::OnKeyUp( wxKeyEvent& event ) +{ + if ( !m_owner->GetEventHandler()->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, @@ -874,27 +3493,88 @@ 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(); +} - int colLblH = WXGRID_DEFAULT_COL_LABEL_HEIGHT; - int rowLblW = WXGRID_DEFAULT_ROW_LABEL_WIDTH; + +wxGrid::~wxGrid() +{ + 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; +} + + +// +// ----- internal init and update functions +// + +void wxGrid::Create() +{ + m_created = FALSE; // set to TRUE by CreateGrid + + m_table = (wxGridTableBase *) NULL; + m_ownTable = FALSE; + + m_cellEditCtrlEnabled = FALSE; + + m_defaultCellAttr = new wxGridCellAttr; + m_defaultCellAttr->SetDefAttr(m_defaultCellAttr); + + // Set default cell attributes + m_defaultCellAttr->SetKind(wxGridCellAttr::Default); + 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; + m_currentCellCoords = wxGridNoCellCoords; + + 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, + wxDefaultSize ); m_rowLabelWin = new wxGridRowLabelWindow( this, -1, wxDefaultPosition, - wxSize(rowLblW,-1) ); + wxDefaultSize ); m_colLabelWin = new wxGridColLabelWindow( this, -1, wxDefaultPosition, - wxSize(-1, colLblH ) ); - - m_cornerLabelWin = new wxGridCornerLabelWindow( this, - -1, - wxDefaultPosition, - wxSize(rowLblW, colLblH ) ); + wxDefaultSize ); m_gridWin = new wxGridWindow( this, m_rowLabelWin, @@ -904,60 +3584,63 @@ wxGrid::wxGrid( wxWindow *parent, wxDefaultSize ); SetTargetWindow( m_gridWin ); +} - m_mainSizer = new wxBoxSizer( wxVERTICAL ); - - m_topSizer = new wxBoxSizer( wxHORIZONTAL ); - m_topSizer->Add( m_cornerLabelWin, 0 ); - m_topSizer->Add( m_colLabelWin, 1 ); - - m_mainSizer->Add( m_topSizer, 0, wxEXPAND ); - m_middleSizer = new wxBoxSizer( wxHORIZONTAL ); - m_middleSizer->Add( m_rowLabelWin, 0, wxEXPAND ); - m_middleSizer->Add( m_gridWin, 1, wxEXPAND ); +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_mainSizer->Add( m_middleSizer, 1, wxEXPAND ); + m_numRows = numRows; + m_numCols = numCols; - SetAutoLayout( TRUE ); - SetSizer( m_mainSizer ); -} + 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; -wxGrid::~wxGrid() -{ - delete m_table; + return m_created; } - -// -// ----- internal init and update functions -// - -void wxGrid::Create() +void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode) { - m_table = (wxGridTableBase *) NULL; - m_gridWin = (wxGridWindow *) NULL; - m_rowLabelWin = (wxGridRowLabelWindow *) NULL; - m_colLabelWin = (wxGridColLabelWindow *) NULL; - m_cornerLabelWin = (wxGridCornerLabelWindow *) NULL; - m_cellEditCtrl = (wxWindow *) NULL; + if ( !m_created ) + { + wxFAIL_MSG( wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") ); + } + else + m_selection->SetSelectionMode( selmode ); } - -bool wxGrid::CreateGrid( int numRows, int numCols ) +bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership, + wxGrid::wxGridSelectionModes selmode ) { if ( m_created ) { - wxLogError( wxT("wxGrid::CreateGrid(numRows, numCols) 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; } @@ -968,14 +3651,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; @@ -990,109 +3665,207 @@ 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(); -#if defined (__WXMOTIF__) // see also text ctrl sizing in ShowCellEditControl() +#if defined(__WXMOTIF__) || defined(__WXGTK__) // see also text ctrl sizing in ShowCellEditControl() m_defaultRowHeight += 8; #else m_defaultRowHeight += 4; #endif + m_gridLineColour = wxColour( 128, 128, 255 ); + m_gridLinesEnabled = TRUE; + m_cellHighlightColour = m_gridLineColour; + m_cellHighlightPenWidth = 2; + m_cellHighlightROPenWidth = 1; + + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + m_winCapture = (wxWindow *)NULL; + 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 ? - // - m_defaultCellFont = this->GetFont(); +int wxGrid::GetColWidth(int col) const +{ + return m_colWidths.IsEmpty() ? m_defaultColWidth : m_colWidths[col]; +} + +int wxGrid::GetColLeft(int col) const +{ + return m_colRights.IsEmpty() ? col * m_defaultColWidth + : m_colRights[col] - m_colWidths[col]; +} - m_gridLineColour = wxColour( 128, 128, 255 ); - m_gridLinesEnabled = TRUE; +int wxGrid::GetColRight(int col) const +{ + return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth + : m_colRights[col]; +} - m_cursorMode = WXGRID_CURSOR_DEFAULT; - m_dragLastPos = -1; - m_dragRowOrCol = -1; - m_isDragging = FALSE; +int wxGrid::GetRowHeight(int row) const +{ + return m_rowHeights.IsEmpty() ? m_defaultRowHeight : m_rowHeights[row]; +} - m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS ); - m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE ); +int wxGrid::GetRowTop(int row) const +{ + return m_rowBottoms.IsEmpty() ? row * m_defaultRowHeight + : m_rowBottoms[row] - m_rowHeights[row]; +} - m_currentCellCoords = wxGridNoCellCoords; +int wxGrid::GetRowBottom(int row) const +{ + return m_rowBottoms.IsEmpty() ? (row + 1) * m_defaultRowHeight + : m_rowBottoms[row]; +} - m_selectedTopLeft = wxGridNoCellCoords; - m_selectedBottomRight = wxGridNoCellCoords; +void wxGrid::CalcDimensions() +{ + int cw, ch; + GetClientSize( &cw, &ch ); - m_editable = TRUE; // default for whole grid + if ( m_colLabelWin->IsShown() ) + cw -= m_rowLabelWidth; + if ( m_rowLabelWin->IsShown() ) + ch -= m_colLabelHeight; - m_inOnKeyDown = FALSE; - m_batchCount = 0; + // grid total size + int w = m_numCols > 0 ? GetColRight(m_numCols - 1) + m_extraWidth + 1 : 0; + int h = m_numRows > 0 ? GetRowBottom(m_numRows - 1) + m_extraHeight + 1 : 0; - // TODO: extend this to other types of controls - // - m_cellEditCtrl = new wxGridTextCtrl( m_gridWin, - this, - TRUE, - wxGRID_CELLCTRL, - "", - wxPoint(1,1), - wxSize(1,1) -#ifdef __WXMSW__ - , wxTE_MULTILINE | wxTE_NO_VSCROLL -#endif - ); + // preserve (more or less) the previous position + int x, y; + GetViewStart( &x, &y ); + // maybe we don't need scrollbars at all? and if we do, transform w and h + // from pixels into logical units + if ( w <= cw ) + { + w = 0; x= 0; + } + else + { + w = (w + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE; + if ( x >= w ) + x = w - 1; + } + if ( h <= ch ) + { + h = 0; y = 0; + } + else + { + h = (h + GRID_SCROLL_LINE - 1)/GRID_SCROLL_LINE; + if ( y >= h ) + y = h - 1; + } - m_cellEditCtrl->Show( FALSE ); - m_cellEditCtrlEnabled = TRUE; - m_editCtrlType = wxGRID_TEXTCTRL; + // do set scrollbar parameters + SetScrollbars( GRID_SCROLL_LINE, GRID_SCROLL_LINE, + w, h, x, y, (GetBatchCount() != 0)); } -void wxGrid::CalcDimensions() +void wxGrid::CalcWindowSizes() { int cw, ch; GetClientSize( &cw, &ch ); - if ( m_numRows > 0 && m_numCols > 0 ) - { - int right = m_colRights[ m_numCols-1 ] + 20; - int bottom = m_rowBottoms[ m_numRows-1 ] + 20; + if ( m_cornerLabelWin->IsShown() ) + m_cornerLabelWin->SetSize( 0, 0, m_rowLabelWidth, m_colLabelHeight ); - // TODO: restore the scroll position that we had before sizing - // - int x, y; - GetViewStart( &x, &y ); - SetScrollbars( 10, 10, - right/10, bottom/10, - x, y ); - } + if ( m_colLabelWin->IsShown() ) + m_colLabelWin->SetSize( m_rowLabelWidth, 0, cw-m_rowLabelWidth, m_colLabelHeight); + + if ( m_rowLabelWin->IsShown() ) + m_rowLabelWin->SetSize( 0, m_colLabelHeight, m_rowLabelWidth, ch-m_colLabelHeight); + + if ( m_gridWin->IsShown() ) + m_gridWin->SetSize( m_rowLabelWidth, m_colLabelHeight, cw-m_rowLabelWidth, ch-m_colLabelHeight); } @@ -1102,6 +3875,21 @@ void wxGrid::CalcDimensions() 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() ) { @@ -1109,71 +3897,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 ) { - bottom += m_rowHeights[i]; - m_rowBottoms[i] = bottom; + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); + } + if ( !GetBatchCount() ) + { + 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++ ) @@ -1182,82 +3998,134 @@ bool wxGrid::Redimension( wxGridTableMessage& msg ) m_rowBottoms[i] = h; } } - - CalcDimensions(); + if ( !m_numRows ) + { + m_currentCellCoords = wxGridNoCellCoords; + } + else + { + if ( m_currentCellCoords.GetRow() >= m_numRows ) + m_currentCellCoords.Set( 0, 0 ); + } + m_selection->UpdateRows( pos, -((int)numRows) ); + wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); + if (attrProvider) { + attrProvider->UpdateAttrRows( pos, -((int)numRows) ); +// ifdef'd out following patch from Paul Gammans +#if 0 + // No need to touch column attributes, unless we + // removed _all_ rows, in this case, we remove + // all column attributes. + // I hate to do this here, but the + // needed data is not available inside UpdateAttrRows. + if ( !GetNumberRows() ) + attrProvider->UpdateAttrCols( 0, -GetNumberCols() ); +#endif + } + if ( !GetBatchCount() ) + { + CalcDimensions(); + m_rowLabelWin->Refresh(); + } } - return TRUE; + result = TRUE; + break; case wxGRIDTABLE_NOTIFY_COLS_INSERTED: { size_t pos = msg.GetCommandInt(); int numCols = msg.GetCommandInt2(); - for ( i = 0; i < numCols; i++ ) - { - m_colWidths.Insert( m_defaultColWidth, pos ); - m_colRights.Insert( 0, pos ); - } m_numCols += numCols; - int right = 0; - if ( pos > 0 ) right = m_colRights[pos-1]; + if ( !m_colWidths.IsEmpty() ) + { + for ( i = 0; i < numCols; i++ ) + { + m_colWidths.Insert( m_defaultColWidth, pos ); + m_colRights.Insert( 0, pos ); + } + + int right = 0; + if ( pos > 0 ) right = m_colRights[pos-1]; - for ( i = pos; i < m_numCols; i++ ) + for ( i = pos; i < m_numCols; i++ ) + { + right += m_colWidths[i]; + m_colRights[i] = right; + } + } + if ( m_currentCellCoords == wxGridNoCellCoords ) { - right += m_colWidths[i]; - m_colRights[i] = right; + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); } - CalcDimensions(); + m_selection->UpdateCols( pos, numCols ); + wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider(); + if (attrProvider) + attrProvider->UpdateAttrCols( pos, numCols ); + if ( !GetBatchCount() ) + { + CalcDimensions(); + m_colLabelWin->Refresh(); + } + } - return TRUE; + result = TRUE; + break; case wxGRIDTABLE_NOTIFY_COLS_APPENDED: { int numCols = msg.GetCommandInt(); - for ( i = 0; i < numCols; i++ ) - { - m_colWidths.Add( m_defaultColWidth ); - m_colRights.Add( 0 ); - } - int oldNumCols = m_numCols; m_numCols += numCols; + if ( !m_colWidths.IsEmpty() ) + { + for ( i = 0; i < numCols; i++ ) + { + m_colWidths.Add( m_defaultColWidth ); + m_colRights.Add( 0 ); + } - int right = 0; - if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1]; + int right = 0; + if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1]; - for ( i = oldNumCols; i < m_numCols; i++ ) + for ( i = oldNumCols; i < m_numCols; i++ ) + { + right += m_colWidths[i]; + m_colRights[i] = right; + } + } + if ( m_currentCellCoords == wxGridNoCellCoords ) { - right += m_colWidths[i]; - m_colRights[i] = right; + // if we have just inserted cols into an empty grid the current + // cell will be undefined... + // + SetCurrentCell( 0, 0 ); + } + if ( !GetBatchCount() ) + { + 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 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_colWidths.IsEmpty() ) { - 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++ ) @@ -1266,22 +4134,53 @@ 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; + result = TRUE; + break; } - return FALSE; + if (result && !GetBatchCount() ) + m_gridWin->Refresh(); + return result; } -void wxGrid::CalcRowLabelsExposed( wxRegion& reg ) +wxArrayInt wxGrid::CalcRowLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; - m_rowLabelsExposed.Empty(); - + wxArrayInt rowlabels; + int top, bottom; while ( iter ) { @@ -1308,28 +4207,30 @@ 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 ); + rowlabels.Add( row ); } iter++ ; } + + return rowlabels; } -void wxGrid::CalcColLabelsExposed( wxRegion& reg ) +wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; - m_colLabelsExposed.Empty(); + wxArrayInt colLabels; int left, right; while ( iter ) @@ -1357,30 +4258,29 @@ 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 ); + colLabels.Add( col ); } iter++ ; } + return colLabels; } -void wxGrid::CalcCellsExposed( wxRegion& reg ) +wxGridCellCoordsArray wxGrid::CalcCellsExposed( const wxRegion& reg ) { wxRegionIterator iter( reg ); wxRect r; - m_cellsExposed.Empty(); - m_rowsExposed.Empty(); - m_colsExposed.Empty(); + wxGridCellCoordsArray cellsExposed; int left, top, right, bottom; while ( iter ) @@ -1409,30 +4309,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 ); - m_cellsExposed.Add( wxGridCellCoords( row, col ) ); + cellsExposed.Add( wxGridCellCoords( row, col ) ); } } - iter++ ; + iter++; } + + return cellsExposed; } @@ -1458,7 +4359,10 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - dc.SetLogicalFunction(wxXOR); + y = wxMax( y, + GetRowTop(m_dragRowOrCol) + + GetRowMinimalHeight(m_dragRowOrCol) ); + dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); @@ -1469,14 +4373,19 @@ 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() ); } - } - break; + + // default label to suppress warnings about "enumeration value + // 'xxx' not handled in switch + default: + break; } } return; @@ -1485,9 +4394,17 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) m_isDragging = FALSE; + // ------------ Entering or leaving the window + // + if ( event.Entering() || event.Leaving() ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); + } + + // ------------ Left button pressed // - if ( event.LeftDown() ) + else if ( event.LeftDown() ) { // don't send a label click event for a hit on the // edge of the row label - this is probably the user @@ -1496,17 +4413,35 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) if ( YToEdgeOfRow(y) < 0 ) { row = YToRow(y); - if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) + if ( row >= 0 && + !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) ) { - SelectRow( row, event.ShiftDown() ); - m_cursorMode = WXGRID_CURSOR_SELECT_ROW; + 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); } } else { // starting to drag-resize a row // - m_rowLabelWin->CaptureMouse(); + if ( CanDragRowSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin); } } @@ -1518,7 +4453,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 ); } } @@ -1529,41 +4464,16 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) { - m_rowLabelWin->ReleaseMouse(); - - if ( m_dragLastPos >= 0 ) - { - // erase the last line and resize the row - // - int cw, ch, left, dummy; - m_gridWin->GetClientSize( &cw, &ch ); - CalcUnscrolledPosition( 0, 0, &left, &dummy ); - - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - dc.SetLogicalFunction( wxINVERT ); - dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); - HideCellEditControl(); - - int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol]; - SetRowSize( m_dragRowOrCol, wxMax( y - rowTop, WXGRID_MIN_ROW_HEIGHT ) ); - if ( !GetBatchCount() ) - { - // TODO: optimize this - m_rowLabelWin->Refresh(); - m_gridWin->Refresh(); - } - - ShowCellEditControl(); + DoEndDragResizeRow(); - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); - } + // Note: we are ending the event *after* doing + // default processing in this case + // + SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); } - m_dragLastPos = -1; + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin); + m_dragLastPos = -1; } @@ -1572,7 +4482,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 } @@ -1584,7 +4494,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 } @@ -1600,17 +4510,14 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - m_cursorMode = WXGRID_CURSOR_RESIZE_ROW; - m_rowLabelWin->SetCursor( m_rowResizeCursor ); + // don't capture the mouse yet + if ( CanDragRowSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE); } } - else + else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) { - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - m_rowLabelWin->SetCursor( *wxSTANDARD_CURSOR ); - } + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin, FALSE); } } } @@ -1638,7 +4545,10 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - dc.SetLogicalFunction(wxXOR); + + x = wxMax( x, GetColLeft(m_dragRowOrCol) + + GetColMinimalWidth(m_dragRowOrCol)); + dc.SetLogicalFunction(wxINVERT); if ( m_dragLastPos >= 0 ) { dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); @@ -1649,14 +4559,19 @@ 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() ); } - } - break; + + // default label to suppress warnings about "enumeration value + // 'xxx' not handled in switch + default: + break; } } return; @@ -1665,9 +4580,17 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) m_isDragging = FALSE; + // ------------ Entering or leaving the window + // + if ( event.Entering() || event.Leaving() ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); + } + + // ------------ Left button pressed // - if ( event.LeftDown() ) + else if ( event.LeftDown() ) { // don't send a label click event for a hit on the // edge of the col label - this is probably the user @@ -1676,17 +4599,34 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) if ( XToEdgeOfCol(x) < 0 ) { col = XToCol(x); - if ( !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) + if ( col >= 0 && + !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) ) { - SelectCol( col, event.ShiftDown() ); - m_cursorMode = WXGRID_CURSOR_SELECT_COL; + 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); } } else { // starting to drag-resize a col // - m_colLabelWin->CaptureMouse(); + if ( CanDragColSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin); } } @@ -1698,52 +4638,26 @@ 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 ); } - } - - - // ------------ Left button released - // - else if ( event.LeftUp() ) - { - if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) - { - m_colLabelWin->ReleaseMouse(); - - if ( m_dragLastPos >= 0 ) - { - // erase the last line and resize the col - // - int cw, ch, dummy, top; - m_gridWin->GetClientSize( &cw, &ch ); - CalcUnscrolledPosition( 0, 0, &dummy, &top ); - - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); - dc.SetLogicalFunction( wxINVERT ); - dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); - HideCellEditControl(); - - int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol]; - SetColSize( m_dragRowOrCol, wxMax( x - colLeft, WXGRID_MIN_COL_WIDTH ) ); + } - if ( !GetBatchCount() ) - { - // TODO: optimize this - m_colLabelWin->Refresh(); - m_gridWin->Refresh(); - } - ShowCellEditControl(); + // ------------ Left button released + // + else if ( event.LeftUp() ) + { + if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) + { + DoEndDragResizeCol(); - // 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_COL_SIZE, -1, m_dragRowOrCol, event ); } + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin); m_dragLastPos = -1; } @@ -1753,7 +4667,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 } @@ -1765,7 +4679,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 } @@ -1781,17 +4695,14 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - m_cursorMode = WXGRID_CURSOR_RESIZE_COL; - m_colLabelWin->SetCursor( m_colResizeCursor ); + // don't capture the cursor yet + if ( CanDragColSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE); } } - else + else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) { - if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL ) - { - m_cursorMode = WXGRID_CURSOR_SELECT_CELL; - m_colLabelWin->SetCursor( *wxSTANDARD_CURSOR ); - } + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin, FALSE); } } } @@ -1804,7 +4715,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(); } @@ -1812,12 +4723,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 } @@ -1825,13 +4736,78 @@ 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 } } } +void wxGrid::ChangeCursorMode(CursorMode mode, + wxWindow *win, + bool captureMouse) +{ +#ifdef __WXDEBUG__ + static const wxChar *cursorModes[] = + { + _T("SELECT_CELL"), + _T("RESIZE_ROW"), + _T("RESIZE_COL"), + _T("SELECT_ROW"), + _T("SELECT_COL") + }; + + wxLogTrace(_T("grid"), + _T("wxGrid cursor mode (mouse capture for %s): %s -> %s"), + win == m_colLabelWin ? _T("colLabelWin") + : win ? _T("rowLabelWin") + : _T("gridWin"), + cursorModes[m_cursorMode], cursorModes[mode]); +#endif // __WXDEBUG__ + + if ( mode == m_cursorMode && + win == m_winCapture && + captureMouse == (m_winCapture != NULL)) + return; + + if ( !win ) + { + // by default use the grid itself + win = m_gridWin; + } + + if ( m_winCapture ) + { + m_winCapture->ReleaseMouse(); + m_winCapture = (wxWindow *)NULL; + } + + m_cursorMode = mode; + + switch ( m_cursorMode ) + { + case WXGRID_CURSOR_RESIZE_ROW: + win->SetCursor( m_rowResizeCursor ); + break; + + case WXGRID_CURSOR_RESIZE_COL: + win->SetCursor( m_colResizeCursor ); + break; + + default: + win->SetCursor( *wxSTANDARD_CURSOR ); + } + + // we need to capture mouse when resizing + bool resize = m_cursorMode == WXGRID_CURSOR_RESIZE_ROW || + m_cursorMode == WXGRID_CURSOR_RESIZE_COL; + + if ( captureMouse && resize ) + { + win->CaptureMouse(); + m_winCapture = win; + } +} void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { @@ -1844,50 +4820,209 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) if ( event.Dragging() ) { - m_isDragging = TRUE; + //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 ( 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 { - if ( !IsInSelection( coords ) ) - 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. } } } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) + { + int cw, ch, left, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &left, &dummy ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + y = wxMax( y, GetRowTop(m_dragRowOrCol) + + GetRowMinimalHeight(m_dragRowOrCol) ); + dc.SetLogicalFunction(wxINVERT); + if ( m_dragLastPos >= 0 ) + { + dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); + } + dc.DrawLine( left, y, left+cw, y ); + m_dragLastPos = y; + } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) + { + int cw, ch, dummy, top; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &dummy, &top ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + x = wxMax( x, GetColLeft(m_dragRowOrCol) + + GetColMinimalWidth(m_dragRowOrCol) ); + dc.SetLogicalFunction(wxINVERT); + if ( m_dragLastPos >= 0 ) + { + dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); + } + dc.DrawLine( x, top, x, top+ch ); + m_dragLastPos = x; + } return; } m_isDragging = FALSE; + m_startDragPos = wxDefaultPosition; - if ( event.LeftDown() ) + // 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() ) { - if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK, - coords.GetRow(), - coords.GetCol(), - event ) ) + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + m_gridWin->SetCursor( *wxSTANDARD_CURSOR ); + } + else +#endif // 0 + + // ------------ Left button pressed + // + if ( event.LeftDown() && coords != wxGridNoCellCoords ) + { + if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK, + coords.GetRow(), + coords.GetCol(), + event ) ) { - MakeCellVisible( coords ); - SetCurrentCell( coords ); + if ( !event.ControlDown() ) + ClearSelection(); + if ( event.ShiftDown() ) + { + 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 ) + { + 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 + { + 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() ) + else if ( event.LeftDClick() && coords != wxGridNoCellCoords ) { - SendEvent( EVT_GRID_CELL_LEFT_DCLICK, - coords.GetRow(), - coords.GetCol(), - event ); + DisableCellEditControl(); + + if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 ) + { + SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK, + coords.GetRow(), + coords.GetCol(), + event ); + } } @@ -1897,10 +5032,49 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) { if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) { - if ( IsSelection() ) + if ( m_selectingTopLeft != wxGridNoCellCoords && + m_selectingBottomRight != wxGridNoCellCoords ) { - SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event ); + if (m_winCapture) + { + m_winCapture->ReleaseMouse(); + m_winCapture = NULL; + } + m_selection->SelectBlock( m_selectingTopLeft.GetRow(), + m_selectingTopLeft.GetCol(), + m_selectingBottomRight.GetRow(), + m_selectingBottomRight.GetCol(), + event.ControlDown(), + event.ShiftDown(), + event.AltDown(), + event.MetaDown() ); + m_selectingTopLeft = wxGridNoCellCoords; + m_selectingBottomRight = wxGridNoCellCoords; } + + // Show the edit control, if it has been hidden for + // 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( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event ); + } + else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + DoEndDragResizeCol(); + + // 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; @@ -1909,9 +5083,10 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // ------------ Right button down // - else if ( event.RightDown() ) + else if ( event.RightDown() && coords != wxGridNoCellCoords ) { - if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK, + DisableCellEditControl(); + if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK, coords.GetRow(), coords.GetCol(), event ) ) @@ -1923,9 +5098,10 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // ------------ Right double click // - else if ( event.RightDClick() ) + else if ( event.RightDClick() && coords != wxGridNoCellCoords ) { - if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK, + DisableCellEditControl(); + if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK, coords.GetRow(), coords.GetCol(), event ) ) @@ -1933,9 +5109,144 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // no default action at the moment } } + + // ------------ Moving and no button action + // + else if ( event.Moving() && !event.IsButton() ) + { + int dragRow = YToEdgeOfRow( y ); + int dragCol = XToEdgeOfCol( x ); + + // Dragging on the corner of a cell to resize in both + // directions is not implemented yet... + // + if ( dragRow >= 0 && dragCol >= 0 ) + { + ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL); + return; + } + + if ( dragRow >= 0 ) + { + m_dragRowOrCol = dragRow; + + if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL ) + { + if ( CanDragRowSize() && CanDragGridSize() ) + ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW); + } + + if ( dragCol >= 0 ) + { + m_dragRowOrCol = dragCol; + } + + return; + } + + if ( dragCol >= 0 ) + { + m_dragRowOrCol = dragCol; + + if ( m_cursorMode == 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); + } + } +} + + +void wxGrid::DoEndDragResizeRow() +{ + if ( m_dragLastPos >= 0 ) + { + // erase the last line and resize the row + // + int cw, ch, left, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &left, &dummy ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction( wxINVERT ); + dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos ); + HideCellEditControl(); + SaveEditControlValue(); + + int rowTop = GetRowTop(m_dragRowOrCol); + SetRowSize( m_dragRowOrCol, + wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) ); + + if ( !GetBatchCount() ) + { + // Only needed to get the correct rect.y: + wxRect rect ( CellToRect( m_dragRowOrCol, 0 ) ); + rect.x = 0; + CalcScrolledPosition(0, rect.y, &dummy, &rect.y); + rect.width = m_rowLabelWidth; + rect.height = ch - rect.y; + m_rowLabelWin->Refresh( TRUE, &rect ); + rect.width = cw; + m_gridWin->Refresh( FALSE, &rect ); + } + + ShowCellEditControl(); + } +} + + +void wxGrid::DoEndDragResizeCol() +{ + if ( m_dragLastPos >= 0 ) + { + // erase the last line and resize the col + // + int cw, ch, dummy, top; + m_gridWin->GetClientSize( &cw, &ch ); + CalcUnscrolledPosition( 0, 0, &dummy, &top ); + + wxClientDC dc( m_gridWin ); + PrepareDC( dc ); + dc.SetLogicalFunction( wxINVERT ); + dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch ); + HideCellEditControl(); + SaveEditControlValue(); + + int colLeft = GetColLeft(m_dragRowOrCol); + SetColSize( m_dragRowOrCol, + wxMax( m_dragLastPos - colLeft, + GetColMinimalWidth(m_dragRowOrCol) ) ); + + if ( !GetBatchCount() ) + { + // Only needed to get the correct rect.x: + wxRect rect ( CellToRect( 0, m_dragRowOrCol ) ); + rect.y = 0; + CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); + rect.width = cw - rect.x; + rect.height = m_colLabelHeight; + m_colLabelWin->Refresh( TRUE, &rect ); + rect.height = ch; + m_gridWin->Refresh( FALSE, &rect ); + } + + ShowCellEditControl(); + } } + // // ------ interaction with data model // @@ -1973,8 +5284,10 @@ void wxGrid::ClearGrid() { if ( m_table ) { + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + m_table->Clear(); - SetEditControlValue(); if ( !GetBatchCount() ) m_gridWin->Refresh(); } } @@ -1986,47 +5299,21 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::InsertRows() before calling CreateGrid()") ); return FALSE; } if ( m_table ) { - bool ok = m_table->InsertRows( pos, numRows ); + if (IsCellEditControlEnabled()) + DisableCellEditControl(); + + return m_table->InsertRows( pos, numRows ); // the table will have sent the results of the insert row // operation to this view object as a grid table message - // - if ( ok ) - { - if ( m_numCols == 0 ) - { - m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS ); - // - // TODO: perhaps instead of appending the default number of cols - // we should remember what the last non-zero number of cols was ? - // - } - - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - } - - SetEditControlValue(); - return ok; - } - else - { - return FALSE; } + return FALSE; } @@ -2036,62 +5323,36 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::AppendRows() before calling CreateGrid()") ); return FALSE; } - if ( m_table && m_table->AppendRows( numRows ) ) - { - if ( m_currentCellCoords == wxGridNoCellCoords ) - { - // if we have just inserted cols into an empty grid the current - // cell will be undefined... - // - SetCurrentCell( 0, 0 ); - } - - // the table will have sent the results of the append row - // operation to this view object as a grid table message - // - ClearSelection(); - if ( !GetBatchCount() ) Refresh(); - return TRUE; - } - else - { - return FALSE; - } + return ( m_table && m_table->AppendRows( numRows ) ); + // the table will have sent the results of the append row + // operation to this view object as a grid table message } bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) ) { // TODO: something with updateLabels flag - - if ( !m_created ) - { - wxLogError( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") ); - return FALSE; - } - - if ( m_table && 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 + + if ( !m_created ) { + wxFAIL_MSG( wxT("Called wxGrid::DeleteRows() before calling CreateGrid()") ); return FALSE; } + + 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 + } + return FALSE; } @@ -2101,39 +5362,20 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::InsertCols() before calling CreateGrid()") ); return FALSE; } 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; } @@ -2143,31 +5385,13 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::AppendCols() before calling CreateGrid()") ); return FALSE; } - 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 } @@ -2177,28 +5401,20 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) ) if ( !m_created ) { - wxLogError( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") ); + wxFAIL_MSG( wxT("Called wxGrid::DeleteCols() before calling CreateGrid()") ); return FALSE; } - 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; } @@ -2214,8 +5430,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); @@ -2223,21 +5438,23 @@ bool wxGrid::SendEvent( const wxEventType type, type, this, rowOrCol, - mouseEv.GetX(), mouseEv.GetY(), + mouseEv.GetX() + GetRowLabelSize(), + mouseEv.GetY() + GetColLabelSize(), mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), mouseEv.MetaDown() ); - 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(), @@ -2251,12 +5468,13 @@ bool wxGrid::SendEvent( const wxEventType type, type, this, row, col, - mouseEv.GetX(), mouseEv.GetY(), + mouseEv.GetX() + GetRowLabelSize(), + mouseEv.GetY() + GetColLabelSize(), + FALSE, mouseEv.ControlDown(), mouseEv.ShiftDown(), mouseEv.AltDown(), mouseEv.MetaDown() ); - return GetEventHandler()->ProcessEvent(gridEvt); } } @@ -2268,8 +5486,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); @@ -2294,15 +5511,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(); - } + wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW } @@ -2310,10 +5519,10 @@ 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(); - event.Skip(); } @@ -2323,7 +5532,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) { // shouldn't be here - we are going round in circles... // - wxLogFatalError( wxT("wxGrid::OnKeyDown called while alread active") ); + wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") ); } m_inOnKeyDown = TRUE; @@ -2336,6 +5545,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) ) { + // try local handlers // switch ( event.KeyCode() ) @@ -2343,49 +5553,99 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) case WXK_UP: if ( event.ControlDown() ) { - MoveCursorUpBlock(); + MoveCursorUpBlock( event.ShiftDown() ); } else { - MoveCursorUp(); + MoveCursorUp( event.ShiftDown() ); } break; case WXK_DOWN: if ( event.ControlDown() ) { - MoveCursorDownBlock(); + MoveCursorDownBlock( event.ShiftDown() ); } else { - MoveCursorDown(); + MoveCursorDown( event.ShiftDown() ); } break; case WXK_LEFT: if ( event.ControlDown() ) { - MoveCursorLeftBlock(); + MoveCursorLeftBlock( event.ShiftDown() ); } else { - MoveCursorLeft(); + MoveCursorLeft( event.ShiftDown() ); } break; case WXK_RIGHT: if ( event.ControlDown() ) { - MoveCursorRightBlock(); + MoveCursorRightBlock( event.ShiftDown() ); } else { - MoveCursorRight(); + MoveCursorRight( event.ShiftDown() ); } break; case WXK_RETURN: - MoveCursorDown(); + case WXK_NUMPAD_ENTER: + if ( event.ControlDown() ) + { + event.Skip(); // to let the edit control have the return + } + else + { + if ( GetGridCursorRow() < GetNumberRows()-1 ) + { + MoveCursorDown( event.ShiftDown() ); + } + else + { + // at the bottom of a column + HideCellEditControl(); + SaveEditControlValue(); + } + } + break; + + case WXK_ESCAPE: + ClearSelection(); + break; + + case WXK_TAB: + if (event.ShiftDown()) + { + if ( GetGridCursorCol() > 0 ) + { + MoveCursorLeft( FALSE ); + } + else + { + // at left of grid + HideCellEditControl(); + SaveEditControlValue(); + } + } + else + { + if ( GetGridCursorCol() < GetNumberCols()-1 ) + { + MoveCursorRight( FALSE ); + } + else + { + // at right of grid + HideCellEditControl(); + SaveEditControlValue(); + } + } break; case WXK_HOME: @@ -2420,13 +5680,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; } @@ -2435,37 +5737,211 @@ 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; } - wxClientDC dc( m_gridWin ); - PrepareDC( dc ); + wxClientDC dc(m_gridWin); + PrepareDC(dc); if ( m_currentCellCoords != wxGridNoCellCoords ) { HideCellEditControl(); - SaveEditControlValue(); + DisableCellEditControl(); + + if ( IsVisible( m_currentCellCoords, FALSE ) ) + { + wxRect r; + r = BlockToDeviceRect(m_currentCellCoords, coords); + if ( !m_gridLinesEnabled ) + { + r.x--; + r.y--; + r.width++; + r.height++; + } + + wxGridCellCoordsArray cells = CalcCellsExposed( r ); + + // Otherwise refresh redraws the highlight! + m_currentCellCoords = coords; + + DrawGridCellArea(dc,cells); + DrawAllGridLines( dc, r ); + } } m_currentCellCoords = coords; - SetEditControlValue(); - ShowCellEditControl(); + 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 ( IsSelection() ) + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) { - wxRect r( SelectionToDeviceRect() ); - ClearSelection(); - if ( !GetBatchCount() ) m_gridWin->Refresh( TRUE, &r ); + 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; + } + + 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 ) ); + } + + + // Change Selection + m_selectingTopLeft = updateTopLeft; + m_selectingBottomRight = updateBottomRight; + + // various Refresh() calls + for (i = 0; i < 4; i++ ) + if ( need_refresh[i] && rect[i] != wxGridNoCellRect ) + m_gridWin->Refresh( FALSE, &(rect[i]) ); } -} + // never generate an event as it will be generated from + // wxGridSelection::SelectBlock! + // (old comment from when this was the body of SelectBlock) +} // // ------ functions to get/send data (see also public functions) @@ -2511,209 +5987,315 @@ bool wxGrid::SetModelValues() // exposed cells (usually set from the update region by // CalcExposedCells) // -void wxGrid::DrawGridCellArea( wxDC& dc ) +void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells ) { if ( !m_numRows || !m_numCols ) return; size_t i; - size_t numCells = m_cellsExposed.GetCount(); + size_t numCells = cells.GetCount(); for ( i = 0; i < numCells; i++ ) { - DrawCell( dc, m_cellsExposed[i] ); + DrawCell( dc, cells[i] ); } } -void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) +void wxGrid::DrawGridSpace( wxDC& dc ) { - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; + int cw, ch; + m_gridWin->GetClientSize( &cw, &ch ); - if ( m_gridLinesEnabled ) - DrawCellBorder( dc, coords ); + int right, bottom; + CalcUnscrolledPosition( cw, ch, &right, &bottom ); - DrawCellBackground( dc, coords ); + int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0; + int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ; - // TODO: separate functions here for different kinds of cells ? - // e.g. text, image - // - DrawCellValue( dc, coords ); + 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::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) +void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) { - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; - - dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); int row = coords.GetRow(); int col = coords.GetCol(); - // right hand border - // - dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row], - m_colRights[col], m_rowBottoms[row] ); - - // bottom border - // - dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row], - m_colRights[col], m_rowBottoms[row] ); -} + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + return; + // we draw the cell border ourselves +#if !WXGRID_DRAW_LINES + if ( m_gridLinesEnabled ) + DrawCellBorder( dc, coords ); +#endif -void wxGrid::DrawCellBackground( wxDC& dc, const wxGridCellCoords& coords ) -{ - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; + wxGridCellAttr* attr = GetCellAttr(row, col); - int row = coords.GetRow(); - int col = coords.GetCol(); + bool isCurrent = coords == m_currentCellCoords; - dc.SetBackgroundMode( wxSOLID ); + wxRect rect = CellToRect( row, col ); - if ( IsInSelection( coords ) ) + // 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() ) { - // TODO: improve this - // - dc.SetBrush( *wxBLACK_BRUSH ); + wxGridCellEditor *editor = attr->GetEditor(this, row, col); + editor->PaintBackground(rect, attr); + editor->DecRef(); } else { - dc.SetBrush( wxBrush(GetCellBackgroundColour(row, col), wxSOLID) ); + // 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(); } - dc.SetPen( *wxTRANSPARENT_PEN ); + attr->DecRef(); +} + +void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ) +{ + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + + 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 + + int penWidth = attr->IsReadOnly() ? m_cellHighlightROPenWidth : m_cellHighlightPenWidth; + + if (penWidth > 0) { + + // The center of th drawn line is where the position/width/height of + // the rectangle is actually at, (on wxMSW atr least,) so we will + // reduce the size of the rectangle to compensate for the thickness of + // the line. If this is too strange on non wxMSW platforms then + // please #ifdef this appropriately. + rect.x += penWidth/2; + rect.y += penWidth/2; + rect.width -= penWidth-1; + rect.height -= penWidth-1; + + + // Now draw the rectangle + dc.SetPen(wxPen(m_cellHighlightColour, penWidth, wxSOLID)); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.DrawRectangle(rect); + } + +#if 0 + // VZ: my experiments with 3d borders... - dc.DrawRectangle( m_colRights[col] - m_colWidths[col] + 1, - m_rowBottoms[row] - m_rowHeights[row] + 1, - m_colWidths[col]-1, - m_rowHeights[row]-1 ); + // 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::DrawCellValue( wxDC& dc, const wxGridCellCoords& coords ) +void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords ) { - if ( m_colWidths[coords.GetCol()] <=0 || - m_rowHeights[coords.GetRow()] <= 0 ) return; - int row = coords.GetRow(); int col = coords.GetCol(); + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + return; - dc.SetBackgroundMode( wxTRANSPARENT ); + dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); - if ( IsInSelection( row, col ) ) + // right hand border + // + dc.DrawLine( GetColRight(col), GetRowTop(row), + GetColRight(col), GetRowBottom(row) ); + + // bottom border + // + dc.DrawLine( GetColLeft(col), GetRowBottom(row), + GetColRight(col), GetRowBottom(row) ); +} + +void wxGrid::DrawHighlight(wxDC& dc,const wxGridCellCoordsArray& cells) +{ + // This if block was previously in wxGrid::OnPaint but that doesn't + // seem to get called under wxGTK - MB + // + if ( m_currentCellCoords == wxGridNoCellCoords && + m_numRows && m_numCols ) { - // TODO: improve this - // - dc.SetTextBackground( wxColour(0, 0, 0) ); - dc.SetTextForeground( wxColour(255, 255, 255) ); + m_currentCellCoords.Set(0, 0); } - else + + if ( IsCellEditControlShown() ) { - dc.SetTextBackground( GetCellBackgroundColour(row, col) ); - dc.SetTextForeground( GetCellTextColour(row, col) ); + // don't show highlight when the edit control is shown + return; } - dc.SetFont( GetCellFont(row, col) ); - - int hAlign, vAlign; - GetCellAlignment( row, col, &hAlign, &vAlign ); - - wxRect rect; - rect.SetX( m_colRights[col] - m_colWidths[col] + 2 ); - rect.SetY( m_rowBottoms[row] - m_rowHeights[row] + 2 ); - rect.SetWidth( m_colWidths[col] - 4 ); - rect.SetHeight( m_rowHeights[row] - 4 ); - - DrawTextRectangle( dc, GetCellValue( row, col ), rect, hAlign, vAlign ); -} + // if the active cell was repainted, repaint its highlight too because it + // might have been damaged by the grid lines + size_t count = cells.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + if ( cells[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 ) +void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) ) { if ( !m_gridLinesEnabled || !m_numRows || !m_numCols ) return; - int cw, ch; - m_gridWin->GetClientSize(&cw, &ch); + int top, bottom, left, right; + +#if 0 //#ifndef __WXGTK__ + if (reg.IsEmpty()) + { + int cw, ch; + m_gridWin->GetClientSize(&cw, &ch); - // virtual coords of visible area + // virtual coords of visible area + // + CalcUnscrolledPosition( 0, 0, &left, &top ); + CalcUnscrolledPosition( cw, ch, &right, &bottom ); + } + 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 // - int top, bottom, left, right; - CalcUnscrolledPosition( 0, 0, &left, &top ); - CalcUnscrolledPosition( cw, ch, &right, &bottom ); + right = wxMin( right, GetColRight(m_numCols - 1) ); + bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) ); dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); // horizontal grid lines // int i; - for ( i = 0; i <= m_numRows; i++ ) + for ( i = 0; i < m_numRows; i++ ) { - if ( m_rowBottoms[i] > bottom ) + 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 ); } } // vertical grid lines // - for ( i = 0; i <= m_numCols; i++ ) + 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 ); } } } -void wxGrid::DrawRowLabels( wxDC& dc ) +void wxGrid::DrawRowLabels( wxDC& dc ,const wxArrayInt& rows) { - if ( !m_numRows || !m_numCols ) return; + if ( !m_numRows ) return; size_t i; - size_t numLabels = m_rowLabelsExposed.GetCount(); + size_t numLabels = rows.GetCount(); for ( i = 0; i < numLabels; i++ ) { - DrawRowLabel( dc, m_rowLabelsExposed[i] ); + DrawRowLabel( dc, rows[i] ); } } void wxGrid::DrawRowLabel( wxDC& dc, int row ) { - if ( m_rowHeights[row] <= 0 ) return; + if ( GetRowHeight(row) <= 0 ) + return; + + int rowTop = GetRowTop(row), + rowBottom = GetRowBottom(row) - 1; - // draw the label's horizontal border (the vertical border is - // provided by the cell area window margin) - // dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( m_rowLabelWidth-1, rowTop, + m_rowLabelWidth-1, rowBottom ); - dc.DrawLine( 0, m_rowBottoms[row]+1, - m_rowLabelWidth, m_rowBottoms[row]+1 ); + dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom ); dc.SetPen( *wxWHITE_PEN ); - - dc.DrawLine( 0, m_rowBottoms[row]+2, - m_rowLabelWidth, m_rowBottoms[row]+2 ); + dc.DrawLine( 0, rowTop, 0, rowBottom ); + dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop ); dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); @@ -2724,43 +6306,49 @@ 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 ) +void wxGrid::DrawColLabels( wxDC& dc,const wxArrayInt& cols ) { - if ( !m_numRows || !m_numCols ) return; + if ( !m_numCols ) return; size_t i; - size_t numLabels = m_colLabelsExposed.GetCount(); + size_t numLabels = cols.GetCount(); for ( i = 0; i < numLabels; i++ ) { - DrawColLabel( dc, m_colLabelsExposed[i] ); + DrawColLabel( dc, cols[i] ); } } void wxGrid::DrawColLabel( wxDC& dc, int col ) { - if ( m_colWidths[col] <= 0 ) return; + if ( GetColWidth(col) <= 0 ) + return; + + int colLeft = GetColLeft(col), + colRight = GetColRight(col) - 1; - // draw the label's vertical border (the horizontal border is - // provided by the cell area window margin) - // dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( colRight, 0, + colRight, m_colLabelHeight-1 ); - dc.DrawLine( m_colRights[col]+1, 0, - m_colRights[col]+1, m_colLabelHeight ); + dc.DrawLine( colLeft, m_colLabelHeight-1, + colRight, m_colLabelHeight-1 ); dc.SetPen( *wxWHITE_PEN ); + dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 ); + dc.DrawLine( colLeft, 0, colRight, 0 ); - dc.DrawLine( m_colRights[col]+2, 0, - m_colRights[col]+2, m_colLabelHeight ); + dc.SetBackgroundMode( wxTRANSPARENT ); + dc.SetTextForeground( GetLabelTextColour() ); + dc.SetFont( GetLabelFont() ); dc.SetBackgroundMode( wxTRANSPARENT ); dc.SetTextForeground( GetLabelTextColour() ); @@ -2770,26 +6358,43 @@ 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 ); } - void wxGrid::DrawTextRectangle( wxDC& dc, const wxString& value, const wxRect& rect, int horizAlign, int vertAlign ) { - long textWidth, textHeight; - long lineWidth, lineHeight; wxArrayString lines; dc.SetClippingRegion( rect ); StringToLines( value, lines ); + + + //Forward to new API. + DrawTextRectangle( dc, + lines, + rect, + horizAlign, + vertAlign ); + +} + +void wxGrid::DrawTextRectangle( wxDC& dc, + const wxArrayString& lines, + const wxRect& rect, + int horizAlign, + int vertAlign ) +{ + long textWidth, textHeight; + long lineWidth, lineHeight; + if ( lines.GetCount() ) { GetTextBoxSize( dc, lines, &textWidth, &textHeight ); @@ -2798,15 +6403,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; @@ -2814,15 +6419,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; @@ -2830,7 +6435,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; } } @@ -2844,13 +6449,14 @@ void wxGrid::DrawTextRectangle( wxDC& dc, // void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) { - // TODO: this won't work for WXMAC ? (lines end with '\r') - // => use wxTextFile functions then (VZ) int startPos = 0; int pos; - while ( startPos < (int)value.Length() ) + wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix ); + wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix ); + + while ( startPos < (int)tVal.Length() ) { - pos = value.Mid(startPos).Find( '\n' ); + pos = tVal.Mid(startPos).Find( eol ); if ( pos < 0 ) { break; @@ -2861,14 +6467,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) } else { - if ( value[startPos+pos-1] == '\r' ) - { - lines.Add( value.Mid(startPos, pos-1) ); - } - else - { - lines.Add( value.Mid(startPos, pos) ); - } + lines.Add( value.Mid(startPos, pos) ); } startPos += pos+1; } @@ -2880,7 +6479,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) void wxGrid::GetTextBoxSize( wxDC& dc, - wxArrayString& lines, + const wxArrayString& lines, long *width, long *height ) { long w = 0; @@ -2899,6 +6498,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 @@ -2911,106 +6539,154 @@ 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 - // -#if defined (__WXMOTIF__) - rect.SetLeft( wxMax(0, left-4) ); - rect.SetTop( wxMax(0, top-4) ); - rect.SetRight( rect.GetRight() + 8 ); - rect.SetBottom( rect.GetBottom() + 8 ); -#else - rect.SetLeft( wxMax(0, left-2) ); - rect.SetTop( wxMax(0, top-2) ); - rect.SetRight( rect.GetRight() + 4 ); - rect.SetBottom( rect.GetBottom() + 4 ); -#endif - - m_cellEditCtrl->SetSize( rect ); - m_cellEditCtrl->Show( TRUE ); + CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - switch ( m_editCtrlType ) + // 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 + + // cell is shifted by one pixel + rect.x--; + rect.y--; + + 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)); + + wxGridEditorCreatedEvent evt(GetId(), + wxEVT_GRID_EDITOR_CREATED, + this, + row, + col, + editor->GetControl()); + GetEventHandler()->ProcessEvent(evt); + } - 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(); + } } } @@ -3019,94 +6695,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() ); } @@ -3123,8 +6743,17 @@ void wxGrid::SaveEditControlValue() void wxGrid::XYToCell( int x, int y, wxGridCellCoords& coords ) { - coords.SetRow( YToRow(y) ); - coords.SetCol( XToCol(x) ); + int row = YToRow(y); + int col = XToCol(x); + + if ( row == -1 || col == -1 ) + { + coords = wxGridNoCellCoords; + } + else + { + coords.Set( row, col ); + } } @@ -3134,7 +6763,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; @@ -3147,7 +6777,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; @@ -3163,12 +6794,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; } } @@ -3185,12 +6815,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; } } @@ -3205,12 +6834,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; } @@ -3283,11 +6917,18 @@ 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 + // have rounding errors (this is important, because if we do, we + // might not scroll at all and some cells won't be redrawn) + ypos += GRID_SCROLL_LINE / 2; } if ( left < 0 ) @@ -3300,17 +6941,22 @@ 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 + xpos += GRID_SCROLL_LINE / 2; } if ( xpos != -1 || ypos != -1 ) { - if ( xpos != -1 ) xpos = xpos/10; - if ( ypos != -1 ) ypos = ypos/10; + if ( xpos != -1 ) xpos /= GRID_SCROLL_LINE; + if ( ypos != -1 ) ypos /= GRID_SCROLL_LINE; Scroll( xpos, ypos ); AdjustScrollbars(); } @@ -3322,17 +6968,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; } @@ -3340,19 +7002,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; } @@ -3360,17 +7036,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; } @@ -3378,17 +7070,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; } @@ -3406,7 +7114,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 ) { @@ -3436,7 +7144,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 ) { @@ -3456,7 +7164,7 @@ bool wxGrid::MovePageDown() return FALSE; } -bool wxGrid::MoveCursorUpBlock() +bool wxGrid::MoveCursorUpBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -3503,15 +7211,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 && @@ -3558,7 +7274,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; } @@ -3566,7 +7291,7 @@ bool wxGrid::MoveCursorDownBlock() return FALSE; } -bool wxGrid::MoveCursorLeftBlock() +bool wxGrid::MoveCursorLeftBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -3613,7 +7338,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; } @@ -3621,7 +7355,7 @@ bool wxGrid::MoveCursorLeftBlock() return FALSE; } -bool wxGrid::MoveCursorRightBlock() +bool wxGrid::MoveCursorRightBlock( bool expandSelection ) { if ( m_table && m_currentCellCoords != wxGridNoCellCoords && @@ -3667,9 +7401,18 @@ bool wxGrid::MoveCursorRightBlock() } } - MakeCellVisible( row, col ); - SetCurrentCell( row, col ); - + MakeCellVisible( row, col ); + if ( expandSelection ) + { + m_selectingKeyboard = wxGridCellCoords( row, col ); + HighlightBlock( m_currentCellCoords, m_selectingKeyboard ); + } + else + { + ClearSelection(); + SetCurrentCell( row, col ); + } + return TRUE; } @@ -3722,16 +7465,53 @@ wxString wxGrid::GetColLabelValue( int col ) } } + void wxGrid::SetRowLabelSize( int width ) { - // TODO: how to do this with the box sizers ? + width = wxMax( width, 0 ); + if ( width != m_rowLabelWidth ) + { + if ( width == 0 ) + { + m_rowLabelWin->Show( FALSE ); + m_cornerLabelWin->Show( FALSE ); + } + else if ( m_rowLabelWidth == 0 ) + { + m_rowLabelWin->Show( TRUE ); + if ( m_colLabelHeight > 0 ) m_cornerLabelWin->Show( TRUE ); + } + + m_rowLabelWidth = width; + CalcWindowSizes(); + Refresh( TRUE ); + } } + void wxGrid::SetColLabelSize( int height ) { - // TODO: how to do this with the box sizers ? + height = wxMax( height, 0 ); + if ( height != m_colLabelHeight ) + { + if ( height == 0 ) + { + m_colLabelWin->Show( FALSE ); + m_cornerLabelWin->Show( FALSE ); + } + else if ( m_colLabelHeight == 0 ) + { + m_colLabelWin->Show( TRUE ); + if ( m_rowLabelWidth > 0 ) m_cornerLabelWin->Show( TRUE ); + } + + m_colLabelHeight = height; + CalcWindowSizes(); + Refresh( TRUE ); + } } + void wxGrid::SetLabelBackgroundColour( const wxColour& colour ) { if ( m_labelBackgroundColour != colour ) @@ -3775,12 +7555,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; } @@ -3788,25 +7583,38 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert ) if ( !GetBatchCount() ) { m_rowLabelWin->Refresh(); - m_colLabelWin->Refresh(); } } 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; } if ( !GetBatchCount() ) { - m_rowLabelWin->Refresh(); m_colLabelWin->Refresh(); } } @@ -3818,9 +7626,14 @@ void wxGrid::SetRowLabelValue( int row, const wxString& s ) m_table->SetRowLabelValue( row, s ); if ( !GetBatchCount() ) { - // TODO: Optimize this - // - m_rowLabelWin->Refresh(); + wxRect rect = CellToRect( row, 0); + if ( rect.height > 0 ) + { + CalcScrolledPosition(0, rect.y, &rect.x, &rect.y); + rect.x = 0; + rect.width = m_rowLabelWidth; + m_rowLabelWin->Refresh( TRUE, &rect ); + } } } } @@ -3832,9 +7645,14 @@ void wxGrid::SetColLabelValue( int col, const wxString& s ) m_table->SetColLabelValue( col, s ); if ( !GetBatchCount() ) { - // TODO: optimize this - // - m_colLabelWin->Refresh(); + wxRect rect = CellToRect( 0, col ); + if ( rect.width > 0 ) + { + CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y); + rect.y = 0; + rect.height = m_colLabelHeight; + m_colLabelWin->Refresh( TRUE, &rect ); + } } } } @@ -3847,7 +7665,54 @@ void wxGrid::SetGridLineColour( const wxColour& colour ) wxClientDC dc( m_gridWin ); PrepareDC( dc ); - DrawAllGridLines( dc ); + DrawAllGridLines( dc, wxRegion() ); + } +} + + +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::SetCellHighlightPenWidth(int width) +{ + if (m_cellHighlightPenWidth != width) { + m_cellHighlightPenWidth = width; + + // Just redrawing the cell highlight is not enough since that won't + // make any visible change if the the thickness is getting smaller. + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + return; + wxRect rect = CellToRect(row, col); + m_gridWin->Refresh(TRUE, &rect); + } +} + +void wxGrid::SetCellHighlightROPenWidth(int width) +{ + if (m_cellHighlightROPenWidth != width) { + m_cellHighlightROPenWidth = width; + + // Just redrawing the cell highlight is not enough since that won't + // make any visible change if the the thickness is getting smaller. + int row = m_currentCellCoords.GetRow(); + int col = m_currentCellCoords.GetCol(); + if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 ) + return; + wxRect rect = CellToRect(row, col); + m_gridWin->Refresh(TRUE, &rect); } } @@ -3863,7 +7728,7 @@ void wxGrid::EnableGridLines( bool enable ) { wxClientDC dc( m_gridWin ); PrepareDC( dc ); - DrawAllGridLines( dc ); + DrawAllGridLines( dc, wxRegion() ); } else { @@ -3873,134 +7738,511 @@ void wxGrid::EnableGridLines( bool enable ) } } - -int wxGrid::GetDefaultRowSize() + +int wxGrid::GetDefaultRowSize() +{ + return m_defaultRowHeight; +} + +int wxGrid::GetRowSize( int row ) +{ + wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") ); + + return GetRowHeight(row); +} + +int wxGrid::GetDefaultColSize() +{ + return m_defaultColWidth; +} + +int wxGrid::GetColSize( int col ) +{ + wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") ); + + return GetColWidth(col); +} + +// ============================================================================ +// access to the grid attributes: each of them has a default value in the grid +// itself and may be overidden on a per-cell basis +// ============================================================================ + +// ---------------------------------------------------------------------------- +// setting default attributes +// ---------------------------------------------------------------------------- + +void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col ) +{ + m_defaultCellAttr->SetBackgroundColour(col); +#ifdef __WXGTK__ + m_gridWin->SetBackgroundColour(col); +#endif +} + +void wxGrid::SetDefaultCellTextColour( const wxColour& col ) +{ + m_defaultCellAttr->SetTextColour(col); +} + +void wxGrid::SetDefaultCellAlignment( int horiz, int vert ) +{ + m_defaultCellAttr->SetAlignment(horiz, vert); +} + +void wxGrid::SetDefaultCellFont( const wxFont& font ) +{ + m_defaultCellAttr->SetFont(font); +} + +void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer) +{ + m_defaultCellAttr->SetRenderer(renderer); +} + +void wxGrid::SetDefaultEditor(wxGridCellEditor *editor) +{ + m_defaultCellAttr->SetEditor(editor); +} + +// ---------------------------------------------------------------------------- +// access to the default attrbiutes +// ---------------------------------------------------------------------------- + +wxColour wxGrid::GetDefaultCellBackgroundColour() +{ + return m_defaultCellAttr->GetBackgroundColour(); +} + +wxColour wxGrid::GetDefaultCellTextColour() +{ + return m_defaultCellAttr->GetTextColour(); +} + +wxFont wxGrid::GetDefaultCellFont() +{ + return m_defaultCellAttr->GetFont(); +} + +void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) +{ + m_defaultCellAttr->GetAlignment(horiz, vert); +} + +wxGridCellRenderer *wxGrid::GetDefaultRenderer() const +{ + return m_defaultCellAttr->GetRenderer(NULL, 0, 0); +} + +wxGridCellEditor *wxGrid::GetDefaultEditor() const +{ + return m_defaultCellAttr->GetEditor(NULL,0,0); +} + +// ---------------------------------------------------------------------------- +// access to cell attributes +// ---------------------------------------------------------------------------- + +wxColour wxGrid::GetCellBackgroundColour(int row, int col) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + wxColour colour = attr->GetBackgroundColour(); + attr->DecRef(); + return colour; +} + +wxColour wxGrid::GetCellTextColour( int row, int col ) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + wxColour colour = attr->GetTextColour(); + attr->DecRef(); + return colour; +} + +wxFont wxGrid::GetCellFont( int row, int col ) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + wxFont font = attr->GetFont(); + attr->DecRef(); + return font; +} + +void wxGrid::GetCellAlignment( int row, int col, int *horiz, int *vert ) +{ + wxGridCellAttr *attr = GetCellAttr(row, col); + attr->GetAlignment(horiz, vert); + attr->DecRef(); +} + +wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col) +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); + attr->DecRef(); + + return renderer; +} + +wxGridCellEditor* wxGrid::GetCellEditor(int row, int col) +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellEditor* editor = attr->GetEditor(this, row, col); + attr->DecRef(); + + return editor; +} + +bool wxGrid::IsReadOnly(int row, int col) const +{ + wxGridCellAttr* attr = GetCellAttr(row, col); + bool isReadOnly = attr->IsReadOnly(); + attr->DecRef(); + return isReadOnly; +} + +// ---------------------------------------------------------------------------- +// attribute support: cache, automatic provider creation, ... +// ---------------------------------------------------------------------------- + +bool wxGrid::CanHaveAttributes() +{ + if ( !m_table ) + { + return FALSE; + } + + return m_table->CanHaveAttributes(); +} + +void wxGrid::ClearAttrCache() +{ + if ( m_attrCache.row != -1 ) + { + wxSafeDecRef(m_attrCache.attr); + m_attrCache.attr = NULL; + m_attrCache.row = -1; + } +} + +void wxGrid::CacheAttr(int row, int col, wxGridCellAttr *attr) const +{ + wxGrid *self = (wxGrid *)this; // const_cast + + self->ClearAttrCache(); + self->m_attrCache.row = row; + self->m_attrCache.col = col; + self->m_attrCache.attr = attr; + wxSafeIncRef(attr); +} + +bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const +{ + if ( row == m_attrCache.row && col == m_attrCache.col ) + { + *attr = m_attrCache.attr; + wxSafeIncRef(m_attrCache.attr); + +#ifdef DEBUG_ATTR_CACHE + gs_nAttrCacheHits++; +#endif + + return TRUE; + } + else + { +#ifdef DEBUG_ATTR_CACHE + gs_nAttrCacheMisses++; +#endif + return FALSE; + } +} + +wxGridCellAttr *wxGrid::GetCellAttr(int row, int col) const +{ + wxGridCellAttr *attr; + if ( !LookupAttr(row, col, &attr) ) + { + attr = m_table ? m_table->GetAttr(row, col , wxGridCellAttr::Any) : (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 = (wxGridCellAttr *)NULL; + 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, wxGridCellAttr::Cell ); + if ( !attr ) + { + attr = new wxGridCellAttr; + + // artificially inc the ref count to match DecRef() in caller + attr->IncRef(); + m_table->SetAttr(attr, row, col); + } + 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 = (wxGridCellAttr *)NULL; + + attr = m_table->GetAttr(-1, col, wxGridCellAttr::Col ); + if(!attr) + attr = new wxGridCellAttr; + wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName); + attr->SetRenderer(renderer); + + SetColAttr(col, attr); + +} + +// ---------------------------------------------------------------------------- +// setting cell attributes: this is forwarded to the table +// ---------------------------------------------------------------------------- + +void wxGrid::SetRowAttr(int row, wxGridCellAttr *attr) +{ + if ( CanHaveAttributes() ) + { + m_table->SetRowAttr(attr, row); + ClearAttrCache(); + } + else + { + wxSafeDecRef(attr); + } +} + +void wxGrid::SetColAttr(int col, wxGridCellAttr *attr) +{ + if ( CanHaveAttributes() ) + { + m_table->SetColAttr(attr, col); + ClearAttrCache(); + } + else + { + wxSafeDecRef(attr); + } +} + +void wxGrid::SetCellBackgroundColour( int row, int col, const wxColour& colour ) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetBackgroundColour(colour); + attr->DecRef(); + } +} + +void wxGrid::SetCellTextColour( int row, int col, const wxColour& colour ) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetTextColour(colour); + attr->DecRef(); + } +} + +void wxGrid::SetCellFont( int row, int col, const wxFont& font ) +{ + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetFont(font); + attr->DecRef(); + } +} + +void wxGrid::SetCellAlignment( int row, int col, int horiz, int vert ) { - return m_defaultRowHeight; + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetAlignment(horiz, vert); + attr->DecRef(); + } } -int wxGrid::GetRowSize( int row ) +void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer) { - if ( row >= 0 && row < m_numRows ) - return m_rowHeights[row]; - else - return 0; // TODO: log an error here + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetRenderer(renderer); + attr->DecRef(); + } } -int wxGrid::GetDefaultColSize() +void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor) { - return m_defaultColWidth; + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetEditor(editor); + attr->DecRef(); + } } -int wxGrid::GetColSize( int col ) +void wxGrid::SetReadOnly(int row, int col, bool isReadOnly) { - if ( col >= 0 && col < m_numCols ) - return m_colWidths[col]; - else - return 0; // TODO: log an error here + if ( CanHaveAttributes() ) + { + wxGridCellAttr *attr = GetOrCreateCellAttr(row, col); + attr->SetReadOnly(isReadOnly); + attr->DecRef(); + } } -wxColour wxGrid::GetDefaultCellBackgroundColour() +// ---------------------------------------------------------------------------- +// Data type registration +// ---------------------------------------------------------------------------- + +void wxGrid::RegisterDataType(const wxString& typeName, + wxGridCellRenderer* renderer, + wxGridCellEditor* editor) { - // TODO: replace this temp test code - // - return wxColour( 255, 255, 255 ); + m_typeRegistry->RegisterDataType(typeName, renderer, editor); } -wxColour wxGrid::GetCellBackgroundColour( int WXUNUSED(row), int WXUNUSED(col) ) + +wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const { - // TODO: replace this temp test code - // - return wxColour( 255, 255, 255 ); + wxString typeName = m_table->GetTypeName(row, col); + return GetDefaultEditorForType(typeName); } -wxColour wxGrid::GetDefaultCellTextColour() +wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const { - // TODO: replace this temp test code - // - return wxColour( 0, 0, 0 ); + wxString typeName = m_table->GetTypeName(row, col); + return GetDefaultRendererForType(typeName); } -wxColour wxGrid::GetCellTextColour( int WXUNUSED(row), int WXUNUSED(col) ) +wxGridCellEditor* +wxGrid::GetDefaultEditorForType(const wxString& typeName) const { - // TODO: replace this temp test code - // - return wxColour( 0, 0, 0 ); -} + int index = m_typeRegistry->FindOrCloneDataType(typeName); + if ( index == wxNOT_FOUND ) + { + wxFAIL_MSG(wxT("Unknown data type name")); + return NULL; + } -wxFont wxGrid::GetDefaultCellFont() + return m_typeRegistry->GetEditor(index); +} + +wxGridCellRenderer* +wxGrid::GetDefaultRendererForType(const wxString& typeName) const { - return m_defaultCellFont; + int index = m_typeRegistry->FindOrCloneDataType(typeName); + if ( index == wxNOT_FOUND ) + { + wxFAIL_MSG(wxT("Unknown data type name")); + + return NULL; + } + + return m_typeRegistry->GetRenderer(index); } -wxFont wxGrid::GetCellFont( int WXUNUSED(row), int WXUNUSED(col) ) + +// ---------------------------------------------------------------------------- +// row/col size +// ---------------------------------------------------------------------------- + +void wxGrid::EnableDragRowSize( bool enable ) { - // TODO: replace this temp test code - // - return m_defaultCellFont; + m_canDragRowSize = enable; } -void wxGrid::GetDefaultCellAlignment( int *horiz, int *vert ) + +void wxGrid::EnableDragColSize( bool enable ) { - // TODO: replace this temp test code - // - *horiz = wxLEFT; - *vert = wxTOP; + m_canDragColSize = enable; } -void wxGrid::GetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int *horiz, int *vert ) +void wxGrid::EnableDragGridSize( bool enable ) { - // TODO: replace this temp test code - // - *horiz = wxLEFT; - *vert = wxTOP; + 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; - } - CalcDimensions(); + InitRowHeights(); + if ( !GetBatchCount() ) + CalcDimensions(); } } void wxGrid::SetRowSize( int row, int height ) { - int i; + wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") ); - if ( row >= 0 && row < m_numRows ) + if ( m_rowHeights.IsEmpty() ) { - int h = wxMax( 0, height ); - int diff = h - m_rowHeights[row]; + // need to really create the array + InitRowHeights(); + } - m_rowHeights[row] = h; - for ( i = row; i < m_numRows; i++ ) - { - m_rowBottoms[i] += diff; - } - CalcDimensions(); + int h = wxMax( 0, height ); + int diff = h - m_rowHeights[row]; - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_ROW_SIZE, - row, -1 ); - } - else + m_rowHeights[row] = h; + int i; + for ( i = row; i < m_numRows; i++ ) { - // TODO: log an error here + m_rowBottoms[i] += diff; } + if ( !GetBatchCount() ) + CalcDimensions(); } void wxGrid::SetDefaultColSize( int width, bool resizeExistingCols ) @@ -4009,105 +8251,248 @@ 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; - } - CalcDimensions(); + InitColWidths(); + if ( !GetBatchCount() ) + CalcDimensions(); } } void wxGrid::SetColSize( int col, int width ) { - int i; + wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") ); - if ( col >= 0 && col < m_numCols ) + // should we check that it's bigger than GetColMinimalWidth(col) here? + + if ( m_colWidths.IsEmpty() ) { - int w = wxMax( 0, width ); - int diff = w - m_colWidths[col]; - m_colWidths[col] = w; + // need to really create the array + InitColWidths(); + } - for ( i = col; i < m_numCols; i++ ) - { - m_colRights[i] += diff; - } - CalcDimensions(); + int w = wxMax( 0, width ); + int diff = w - m_colWidths[col]; + m_colWidths[col] = w; - // Note: we are ending the event *after* doing - // default processing in this case - // - SendEvent( EVT_GRID_COL_SIZE, - -1, col ); - } - else + int i; + for ( i = col; i < m_numCols; i++ ) { - // TODO: log an error here + m_colRights[i] += diff; } + if ( !GetBatchCount() ) + CalcDimensions(); } -void wxGrid::SetDefaultCellBackgroundColour( const wxColour& ) + +void wxGrid::SetColMinimalWidth( int col, int width ) { - // TODO: everything !!! - // + m_colMinWidths.Put(col, width); } -void wxGrid::SetCellBackgroundColour( int WXUNUSED(row), int WXUNUSED(col), const wxColour& ) +void wxGrid::SetRowMinimalHeight( int row, int width ) { - // TODO: everything !!! - // + m_rowMinHeights.Put(row, width); } -void wxGrid::SetDefaultCellTextColour( const wxColour& ) +int wxGrid::GetColMinimalWidth(int col) const { - // TODO: everything !!! - // + long value = m_colMinWidths.Get(col); + return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH; } -void wxGrid::SetCellTextColour( int WXUNUSED(row), int WXUNUSED(col), const wxColour& ) +int wxGrid::GetRowMinimalHeight(int row) const { - // TODO: everything !!! - // + long value = m_rowMinHeights.Get(row); + return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT; } -void wxGrid::SetDefaultCellFont( const wxFont& ) +// ---------------------------------------------------------------------------- +// auto sizing +// ---------------------------------------------------------------------------- + +void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column ) { - // TODO: everything !!! - // + wxClientDC dc(m_gridWin); + + // init both of them to avoid compiler warnings, even if weo nly need one + int row = -1, + col = -1; + if ( column ) + col = colOrRow; + else + row = colOrRow; + + wxCoord extent, extentMax = 0; + int max = column ? m_numRows : m_numCols; + for ( int rowOrCol = 0; rowOrCol < max; rowOrCol++ ) + { + if ( column ) + row = rowOrCol; + else + col = rowOrCol; + + wxGridCellAttr* attr = GetCellAttr(row, col); + wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col); + if ( renderer ) + { + wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col); + extent = column ? size.x : size.y; + if ( extent > extentMax ) + { + extentMax = extent; + } + + renderer->DecRef(); + } + + attr->DecRef(); + } + + // now also compare with the column label extent + wxCoord w, h; + dc.SetFont( GetLabelFont() ); + + if ( column ) + dc.GetTextExtent( GetColLabelValue(col), &w, &h ); + else + dc.GetTextExtent( GetRowLabelValue(row), &w, &h ); + + extent = column ? w : h; + if ( extent > extentMax ) + { + extentMax = extent; + } + + 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 + { + if ( column ) + { + // leave some space around text + extentMax += 10; + } + else + { + extentMax += 6; + } + } + + if ( column ){ + SetColSize(col, extentMax); + if ( !GetBatchCount() ) + { + int cw, ch, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + wxRect rect ( CellToRect( 0, col ) ); + rect.y = 0; + CalcScrolledPosition(rect.x, 0, &rect.x, &dummy); + rect.width = cw - rect.x; + rect.height = m_colLabelHeight; + m_colLabelWin->Refresh( TRUE, &rect ); + } + } + else{ + SetRowSize(row, extentMax); + if ( !GetBatchCount() ) + { + int cw, ch, dummy; + m_gridWin->GetClientSize( &cw, &ch ); + wxRect rect ( CellToRect( row, 0 ) ); + rect.x = 0; + CalcScrolledPosition(0, rect.y, &dummy, &rect.y); + rect.width = m_rowLabelWidth; + rect.height = ch - rect.y; + m_rowLabelWin->Refresh( TRUE, &rect ); + } + } + if ( setAsMin ) + { + if ( column ) + SetColMinimalWidth(col, extentMax); + else + SetRowMinimalHeight(row, extentMax); + } } -void wxGrid::SetCellFont( int WXUNUSED(row), int WXUNUSED(col), const wxFont& ) +int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin) { - // TODO: everything !!! - // + int width = m_rowLabelWidth; + + if ( !calcOnly ) + BeginBatch(); + for ( int col = 0; col < m_numCols; col++ ) + { + if ( !calcOnly ) + { + AutoSizeColumn(col, setAsMin); + } + + width += GetColWidth(col); + } + if ( !calcOnly ) + EndBatch(); + return width; } -void wxGrid::SetDefaultCellAlignment( int WXUNUSED(horiz), int WXUNUSED(vert) ) +int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin) { - // TODO: everything !!! - // + int height = m_colLabelHeight; + + if ( !calcOnly ) + BeginBatch(); + for ( int row = 0; row < m_numRows; row++ ) + { + if ( !calcOnly ) + { + AutoSizeRow(row, setAsMin); + } + + height += GetRowHeight(row); + } + if ( !calcOnly ) + EndBatch(); + return height; } -void wxGrid::SetCellAlignment( int WXUNUSED(row), int WXUNUSED(col), int WXUNUSED(horiz), int WXUNUSED(vert) ) +void wxGrid::AutoSize() { - // TODO: everything !!! - // + // set the size too + SetClientSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE)); } +wxSize wxGrid::DoGetBestSize() const +{ + // don't set sizes, only calculate them + wxGrid *self = (wxGrid *)this; // const_cast + return wxSize(self->SetOrCalcColumnSizes(TRUE), + self->SetOrCalcRowSizes(TRUE)); +} + +void wxGrid::Fit() +{ + AutoSize(); +} -// -// ------ cell value accessor functions -// + +wxPen& wxGrid::GetDividerPen() const +{ + return wxNullPen; +} + +// ---------------------------------------------------------------------------- +// cell value accessor functions +// ---------------------------------------------------------------------------- void wxGrid::SetCellValue( int row, int col, const wxString& s ) { if ( m_table ) { - m_table->SetValue( row, col, s.c_str() ); + m_table->SetValue( row, col, s ); if ( !GetBatchCount() ) { wxClientDC dc( m_gridWin ); @@ -4115,15 +8500,16 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s ) DrawCell( dc, wxGridCellCoords(row, col) ); } -#if 0 // TODO: edit in place - if ( m_currentCellCoords.GetRow() == row && - m_currentCellCoords.GetCol() == col ) + m_currentCellCoords.GetCol() == col && + IsCellEditControlShown()) + // Note: If we are using IsCellEditControlEnabled, + // this interacts badly with calling SetCellValue from + // an EVT_GRID_CELL_CHANGE handler. { - SetEditControlValue( s ); + HideCellEditControl(); + ShowCellEditControl(); // will reread data from table } -#endif - } } @@ -4134,209 +8520,168 @@ void wxGrid::SetCellValue( int row, int col, const wxString& s ) void wxGrid::SelectRow( int row, bool addToSelected ) { - wxRect r; - - if ( IsSelection() && addToSelected ) - { - if ( m_selectedTopLeft.GetRow() > row ) - m_selectedTopLeft.SetRow( row ); - - m_selectedTopLeft.SetCol( 0 ); - - if ( m_selectedBottomRight.GetRow() < row ) - m_selectedBottomRight.SetRow( row ); - - m_selectedBottomRight.SetCol( m_numCols - 1 ); - - // TODO: optimize this so that we only refresh the newly - // selected cells - // - r = SelectionToDeviceRect(); - if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r ); - } - else - { - r = SelectionToDeviceRect(); + if ( IsSelection() && !addToSelected ) ClearSelection(); - if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r ); - - m_selectedTopLeft.Set( row, 0 ); - m_selectedBottomRight.Set( row, m_numCols-1 ); - r = SelectionToDeviceRect(); - m_gridWin->Refresh( TRUE, &r ); - } - - wxGridRangeSelectEvent gridEvt( GetId(), - EVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); - GetEventHandler()->ProcessEvent(gridEvt); + m_selection->SelectRow( row, FALSE, addToSelected ); } void wxGrid::SelectCol( int col, bool addToSelected ) { - wxRect r; - - if ( IsSelection() && addToSelected ) - { - if ( m_selectedTopLeft.GetCol() > col ) - m_selectedTopLeft.SetCol( col ); - - m_selectedTopLeft.SetRow( 0 ); + if ( IsSelection() && !addToSelected ) + ClearSelection(); - if ( m_selectedBottomRight.GetCol() < col ) - m_selectedBottomRight.SetCol( col ); + m_selection->SelectCol( col, FALSE, addToSelected ); +} - m_selectedBottomRight.SetRow( m_numRows - 1 ); - // TODO: optimize this so that we only refresh the newly - // selected cells - // - r = SelectionToDeviceRect(); - if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r ); - } - else - { - r = SelectionToDeviceRect(); +void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol, + bool addToSelected ) +{ + if ( IsSelection() && !addToSelected ) ClearSelection(); - if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r ); - m_selectedTopLeft.Set( 0, col ); - m_selectedBottomRight.Set( m_numRows-1, col ); - r = SelectionToDeviceRect(); - m_gridWin->Refresh( TRUE, &r ); - } + m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol, + FALSE, addToSelected ); +} - wxGridRangeSelectEvent gridEvt( GetId(), - EVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); - GetEventHandler()->ProcessEvent(gridEvt); +void wxGrid::SelectAll() +{ + if ( m_numRows > 0 && m_numCols > 0 ) + m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 ); } +// +// ------ Cell, row and col deselection +// -void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol ) +void wxGrid::DeselectRow( int row ) { - int temp; - - if ( topRow > bottomRow ) + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) { - temp = topRow; - topRow = bottomRow; - bottomRow = temp; + if ( m_selection->IsInSelection(row, 0 ) ) + m_selection->ToggleCellSelection( row, 0); } - - if ( leftCol > rightCol ) + else { - temp = leftCol; - leftCol = rightCol; - rightCol = temp; + int nCols = GetNumberCols(); + for ( int i = 0; i < nCols ; i++ ) + { + if ( m_selection->IsInSelection(row, i ) ) + m_selection->ToggleCellSelection( row, i); + } } +} - m_selectedTopLeft.Set( topRow, leftCol ); - m_selectedBottomRight.Set( bottomRow, rightCol ); - - wxRect r; - r = SelectionToDeviceRect(); - m_gridWin->Refresh( TRUE, &r ); - - // 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 ) +void wxGrid::DeselectCol( int col ) +{ + if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns ) { - wxGridRangeSelectEvent gridEvt( GetId(), - EVT_GRID_RANGE_SELECT, - this, - m_selectedTopLeft, - m_selectedBottomRight ); - - GetEventHandler()->ProcessEvent(gridEvt); + if ( m_selection->IsInSelection(0, col ) ) + m_selection->ToggleCellSelection( 0, col); + } + else + { + int nRows = GetNumberRows(); + for ( int i = 0; i < nRows ; i++ ) + { + if ( m_selection->IsInSelection(i, col ) ) + m_selection->ToggleCellSelection(i, col); + } } } -void wxGrid::SelectAll() +void wxGrid::DeselectCell( int row, int col ) { - m_selectedTopLeft.Set( 0, 0 ); - m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 ); + if ( m_selection->IsInSelection(row, col) ) + m_selection->ToggleCellSelection(row, col); +} - 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(); } -// This function returns the rectangle that encloses the selected cells +// This function returns the rectangle that encloses the given block // in device coords clipped to the client size of the grid window. // -wxRect wxGrid::SelectionToDeviceRect() +wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft, + const wxGridCellCoords &bottomRight ) { - wxRect rect; + wxRect rect( wxGridNoCellRect ); wxRect cellRect; - if ( IsSelection() ) + cellRect = CellToRect( topLeft ); + if ( cellRect != wxGridNoCellRect ) { - cellRect = CellToRect( m_selectedTopLeft ); - if ( cellRect != wxGridNoCellRect ) - { - rect = cellRect; - } - else - { - rect = wxRect( 0, 0, 0, 0 ); - } - - cellRect = CellToRect( m_selectedBottomRight ); - if ( cellRect != wxGridNoCellRect ) - { - rect += cellRect; - } - else - { - return wxGridNoCellRect; - } - - // 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 ); + rect = cellRect; + } + else + { + rect = wxRect( 0, 0, 0, 0 ); + } - rect.SetLeft( wxMax(0, left) ); - rect.SetTop( wxMax(0, top) ); - rect.SetRight( wxMin(cw, right) ); - rect.SetBottom( wxMin(ch, bottom) ); + cellRect = CellToRect( bottomRight ); + if ( cellRect != wxGridNoCellRect ) + { + rect += cellRect; } else { return wxGridNoCellRect; } + // 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 ); + + 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) ); + rect.SetBottom( wxMin(ch, bottom) ); + return rect; } + // // ------ Grid event classes // -IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent ) +IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent ) wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj, - int row, int col, int x, int y, + int row, int col, int x, int y, bool sel, bool control, bool shift, bool alt, bool meta ) : wxNotifyEvent( type, id ) { @@ -4344,6 +8689,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; @@ -4353,7 +8699,7 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj, } -IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxEvent ) +IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxNotifyEvent ) wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj, int rowOrCol, int x, int y, @@ -4372,16 +8718,18 @@ wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj, } -IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxEvent ) +IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxNotifyEvent ) wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj, const wxGridCellCoords& topLeft, 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; @@ -4391,5 +8739,18 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec } -#endif // ifndef wxUSE_NEW_GRID +IMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent) +wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type, + wxObject* obj, int row, + int col, wxControl* ctrl) + : wxCommandEvent(type, id) +{ + SetEventObject(obj); + m_row = row; + m_col = col; + m_ctrl = ctrl; +} + + +#endif // ifndef wxUSE_NEW_GRID