///////////////////////////////////////////////////////////////////////////
-// 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:
#include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/log.h"
+ #include "wx/textctrl.h"
+ #include "wx/checkbox.h"
+ #include "wx/combobox.h"
+ #include "wx/valtext.h"
#endif
-// this include needs to be outside precomp for BCC
#include "wx/textfile.h"
+#include "wx/spinctrl.h"
#include "wx/grid.h"
-
// ----------------------------------------------------------------------------
// array classes
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxGridRowOrColAttrData
{
public:
+ // empty ctor to suppress warnings
+ wxGridRowOrColAttrData() { }
~wxGridRowOrColAttrData();
void SetAttr(wxGridCellAttr *attr, int rowOrCol);
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() { delete m_renderer; delete m_editor; }
+
+ wxString m_typeName;
+ wxGridCellRenderer* m_renderer;
+ wxGridCellEditor* m_editor;
+};
+
+
+WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+
+
+class WXDLLEXPORT wxGridTypeRegistry {
+public:
+ ~wxGridTypeRegistry();
+ void RegisterDataType(const wxString& typeName,
+ wxGridCellRenderer* renderer,
+ wxGridCellEditor* editor);
+ int FindDataType(const wxString& typeName);
+ wxGridCellRenderer* GetRenderer(int index);
+ wxGridCellEditor* GetEditor(int index);
+
+private:
+ wxGridDataTypeInfoArray m_typeinfo;
+};
+
+
+
+
// ----------------------------------------------------------------------------
// conditional compilation
// ----------------------------------------------------------------------------
static size_t gs_nAttrCacheMisses = 0;
#endif // DEBUG_ATTR_CACHE
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
wxGridCellCoords wxGridNoCellCoords( -1, -1 );
wxRect wxGridNoCellRect( -1, -1, -1, -1 );
// TODO: fixed so far - make configurable later (and also different for x/y)
static const size_t GRID_SCROLL_LINE = 10;
+// the size of hash tables used a bit everywhere (the max number of elements
+// in these hash tables is the number of rows/columns)
+static const int GRID_HASH_SIZE = 100;
+
// ============================================================================
// implementation
// ============================================================================
-
// ----------------------------------------------------------------------------
// wxGridCellEditor
// ----------------------------------------------------------------------------
Destroy();
}
+void wxGridCellEditor::Create(wxWindow* WXUNUSED(parent),
+ wxWindowID WXUNUSED(id),
+ wxEvtHandler* evtHandler)
+{
+ if ( evtHandler )
+ m_control->PushEventHandler(evtHandler);
+}
+
+void wxGridCellEditor::PaintBackground(const wxRect& rectCell,
+ wxGridCellAttr *attr)
+{
+ // erase the background because we might not fill the cell
+ wxClientDC dc(m_control->GetParent());
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+ dc.DrawRectangle(rectCell);
+
+ // redraw the control we just painted over
+ m_control->Refresh();
+}
void wxGridCellEditor::Destroy()
{
- if (m_control) {
+ if (m_control)
+ {
m_control->Destroy();
m_control = NULL;
}
// set the colours/fonts if we have any
if ( attr )
{
- if ( attr->HasTextColour() )
- {
- m_colFgOld = m_control->GetForegroundColour();
- m_control->SetForegroundColour(attr->GetTextColour());
- }
+ m_colFgOld = m_control->GetForegroundColour();
+ m_control->SetForegroundColour(attr->GetTextColour());
- if ( attr->HasBackgroundColour() )
- {
- m_colBgOld = m_control->GetBackgroundColour();
- m_control->SetBackgroundColour(attr->GetBackgroundColour());
- }
+ m_colBgOld = m_control->GetBackgroundColour();
+ m_control->SetBackgroundColour(attr->GetBackgroundColour());
- if ( attr->HasFont() )
- {
- m_fontOld = m_control->GetFont();
- m_control->SetFont(attr->GetFont());
- }
+ 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
{
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!"));
- m_control->SetSize(rect);
+ m_control->SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
}
void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
{
+ event.Skip();
}
+void wxGridCellEditor::StartingClick()
+{
+}
+// ----------------------------------------------------------------------------
+// wxGridCellTextEditor
+// ----------------------------------------------------------------------------
wxGridCellTextEditor::wxGridCellTextEditor()
{
wxWindowID id,
wxEvtHandler* evtHandler)
{
- m_control = new wxTextCtrl(parent, -1, "",
+ m_control = new wxTextCtrl(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize
#if defined(__WXMSW__)
, wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ???
#endif
- );
+ );
- if (evtHandler)
- m_control->PushEventHandler(evtHandler);
+ 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__)
+ rect.Inflate(rect.x ? 1 : 0, rect.y ? 1 : 0);
+#else // !GTK
+ int extra = rect.x && rect.y ? 2 : 1;
+#if defined(__WXMOTIF__)
+ extra *= 2;
+#endif
+ rect.SetLeft( wxMax(0, rect.x - extra) );
+ rect.SetTop( wxMax(0, rect.y - extra) );
+ rect.SetRight( rect.GetRight() + 2*extra );
+ rect.SetBottom( rect.GetBottom() + 2*extra );
+#endif // GTK/!GTK
+
+ wxGridCellEditor::SetSize(rect);
+}
void wxGridCellTextEditor::BeginEdit(int row, int col, wxGrid* grid)
{
wxT("The wxGridCellEditor must be Created first!"));
m_startValue = grid->GetTable()->GetValue(row, col);
- ((wxTextCtrl*)m_control)->SetValue(m_startValue);
- ((wxTextCtrl*)m_control)->SetInsertionPointEnd();
- ((wxTextCtrl*)m_control)->SetFocus();
-}
+ DoBeginEdit(m_startValue);
+}
+void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
+{
+ Text()->SetValue(startValue);
+ Text()->SetInsertionPointEnd();
+ Text()->SetFocus();
+}
-bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue,
+bool wxGridCellTextEditor::EndEdit(int row, int col,
wxGrid* grid)
{
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!"));
bool changed = FALSE;
- wxString value = ((wxTextCtrl*)m_control)->GetValue();
+ wxString value = Text()->GetValue();
if (value != m_startValue)
changed = TRUE;
grid->GetTable()->SetValue(row, col, value);
m_startValue = wxEmptyString;
- ((wxTextCtrl*)m_control)->SetValue(m_startValue);
+ Text()->SetValue(m_startValue);
return changed;
}
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!"));
- ((wxTextCtrl*)m_control)->SetValue(m_startValue);
- ((wxTextCtrl*)m_control)->SetInsertionPointEnd();
+ DoReset(m_startValue);
}
+void wxGridCellTextEditor::DoReset(const wxString& startValue)
+{
+ Text()->SetValue(startValue);
+ Text()->SetInsertionPointEnd();
+}
void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
{
- wxASSERT_MSG(m_control,
- wxT("The wxGridCellEditor must be Created first!"));
+ if ( !event.AltDown() && !event.MetaDown() && !event.ControlDown() )
+ {
+ // insert the key in the control
+ long keycode = event.KeyCode();
+ if ( isprint(keycode) )
+ {
+ // FIXME this is not going to work for non letters...
+ if ( !event.ShiftDown() )
+ {
+ keycode = tolower(keycode);
+ }
+
+ Text()->AppendText((wxChar)keycode);
+
+ return;
+ }
- int code = event.KeyCode();
- if (code >= 32 && code < 255) {
- wxString st((char)code);
- if (! event.ShiftDown())
- st.LowerCase();
- ((wxTextCtrl*)m_control)->AppendText(st);
}
-}
+ event.Skip();
+}
void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
{
#if defined(__WXMOTIF__) || defined(__WXGTK__)
// wxMotif needs a little extra help...
- int pos = ((wxTextCtrl*)m_control)->GetInsertionPoint();
- wxString s( ((wxTextCtrl*)m_control)->GetValue() );
+ int pos = Text()->GetInsertionPoint();
+ wxString s( Text()->GetValue() );
s = s.Left(pos) + "\n" + s.Mid(pos);
- ((wxTextCtrl*)m_control)->SetValue(s);
- ((wxTextCtrl*)m_control)->SetInsertionPoint( pos );
+ Text()->SetValue(s);
+ Text()->SetInsertionPoint( pos );
#else
// the other ports can handle a Return key press
//
#endif
}
+// ----------------------------------------------------------------------------
+// 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
+ {
+ wxFAIL_MSG( _T("this cell doesn't have numeric value") );
+
+ return;
+ }
+
+ if ( HasRange() )
+ {
+ Spin()->SetValue(m_valueOld);
+ }
+ 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 )
+ {
+ grid->GetTable()->SetValueAsLong(row, col, value);
+ }
+
+ return changed;
+}
+
+void wxGridCellNumberEditor::Reset()
+{
+ if ( HasRange() )
+ {
+ Spin()->SetValue(m_valueOld);
+ }
+ else
+ {
+ DoReset(GetString());
+ }
+}
+
+void wxGridCellNumberEditor::StartingKey(wxKeyEvent& event)
+{
+ if ( !HasRange() )
+ {
+ long keycode = event.KeyCode();
+ if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
+ {
+ wxGridCellTextEditor::StartingKey(event);
+
+ // skip Skip() below
+ return;
+ }
+ }
+
+ event.Skip();
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellFloatEditor
+// ----------------------------------------------------------------------------
+
+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
+ {
+ 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) )
+ {
+ grid->GetTable()->SetValueAsDouble(row, col, value);
+
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+void wxGridCellFloatEditor::Reset()
+{
+ DoReset(GetString());
+}
+
+void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
+{
+ long keycode = event.KeyCode();
+ if ( isdigit(keycode) ||
+ keycode == '+' || keycode == '-' || keycode == '.' )
+ {
+ wxGridCellTextEditor::StartingKey(event);
+
+ // skip Skip() below
+ return;
+ }
+
+ event.Skip();
+}
+
+// ----------------------------------------------------------------------------
+// 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)
+{
+ // position it in the centre of the rectangle (TODO: support alignment?)
+ int w, h;
+ m_control->GetSize(&w, &h);
+
+ // the checkbox without label still has some space to the right in wxGTK,
+ // so shift it to the right
+#ifdef __WXGTK__
+ w -= 8;
+#endif // GTK
+
+ m_control->Move(r.x + r.width/2 - w/2, r.y + r.height/2 - h/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
+ m_startValue = !!grid->GetTable()->GetValue(row, col);
+ 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());
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellChoiceEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
+ const wxChar* choices[],
+ bool allowOthers)
+ : m_allowOthers(allowOthers)
+{
+ m_choices.Alloc(count);
+ for ( size_t n = 0; n < count; n++ )
+ {
+ m_choices.Add(choices[n]);
+ }
+}
+
+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& WXUNUSED(rectCell),
+ wxGridCellAttr * WXUNUSED(attr))
+{
+ // as we fill the entire client area, don't do anything here to minimize
+ // flicker
+}
+
+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; i<count; i++)
+ {
+ if (m_startValue == m_choices[i])
+ {
+ Combo()->SetSelection(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();
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellEditorEvtHandler
+// ----------------------------------------------------------------------------
void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
{
{
case WXK_ESCAPE:
m_editor->Reset();
- m_grid->EnableCellEditControl(FALSE);
+ m_grid->DisableCellEditControl();
break;
case WXK_TAB:
}
}
+// ============================================================================
+// renderer classes
+// ============================================================================
+
// ----------------------------------------------------------------------------
// wxGridCellRenderer
// ----------------------------------------------------------------------------
dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
}
- dc.SetPen( *wxTRANSPARENT_PEN );
- dc.DrawRectangle(rect);
+ dc.SetPen( *wxTRANSPARENT_PEN );
+ dc.DrawRectangle(rect);
+}
+
+wxGridCellRenderer::~wxGridCellRenderer()
+{
+}
+
+// ----------------------------------------------------------------------------
+// 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, y;
+ dc.SetFont(attr.GetFont());
+ dc.GetTextExtent(text, &x, &y);
+
+ return wxSize(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 = wxRIGHT;
+
+ 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);
+}
+
+wxString wxGridCellFloatRenderer::GetString(wxGrid& grid, int row, int col)
+{
+ wxGridTableBase *table = grid.GetTable();
+ wxString text;
+ if ( table->CanGetValueAs(row, col, wxGRID_VALUE_FLOAT) )
+ {
+ if ( !m_format )
+ {
+ m_format.Printf(_T("%%%d.%d%%f"), m_width, m_precision);
+ }
+
+ text.Printf(m_format, table->GetValueAsDouble(row, col));
+ }
+ else
+ {
+ text = table->GetValue(row, col);
+ }
+
+ 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 = wxRIGHT;
+
+ 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));
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellBoolRenderer
+// ----------------------------------------------------------------------------
+
+wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
+
+// between checkmark and box
+static const wxCoord wxGRID_CHECKMARK_MARGIN = 4;
+
+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 + wxGRID_CHECKMARK_MARGIN;
+
+ // FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
+#ifdef __WXGTK__
+ checkSize -= size.y / 2;
+#endif
+
+ delete checkbox;
+
+ ms_sizeCheckMark.x = ms_sizeCheckMark.y = checkSize;
+ }
+
+ return ms_sizeCheckMark;
}
-void wxGridCellStringRenderer::Draw(wxGrid& grid,
- wxGridCellAttr& attr,
- wxDC& dc,
- const wxRect& rectCell,
- int row, int col,
- bool isSelected)
+void wxGridCellBoolRenderer::Draw(wxGrid& grid,
+ wxGridCellAttr& attr,
+ wxDC& dc,
+ const wxRect& rect,
+ int row, int col,
+ bool isSelected)
{
- wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
+ wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
- // now we only have to draw the text
- dc.SetBackgroundMode( wxTRANSPARENT );
+ // draw a check mark in the centre (ignoring alignment - TODO)
+ wxSize size = GetBestSize(grid, attr, dc, row, col);
+ wxRect rectMark;
+ rectMark.x = rect.x + rect.width/2 - size.x/2;
+ rectMark.y = rect.y + rect.height/2 - size.y/2;
+ rectMark.width = size.x;
+ rectMark.height = size.y;
- if ( isSelected )
- {
- dc.SetTextBackground( grid.GetSelectionBackground() );
- dc.SetTextForeground( grid.GetSelectionForeground() );
- }
- else
- {
- dc.SetTextBackground( attr.GetBackgroundColour() );
- dc.SetTextForeground( attr.GetTextColour() );
- }
- dc.SetFont( attr.GetFont() );
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
+ dc.DrawRectangle(rectMark);
- int hAlign, vAlign;
- attr.GetAlignment(&hAlign, &vAlign);
+ rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
- wxRect rect = rectCell;
- rect.x++;
- rect.y++;
- rect.width -= 2;
- rect.height -= 2;
+ bool value;
+ if (grid.GetTable()->CanGetValueAs(row, col, wxT("bool")))
+ value = grid.GetTable()->GetValueAsBool(row, col);
+ else
+ value = !!grid.GetTable()->GetValue(row, col);
- grid.DrawTextRectangle(dc, grid.GetCellValue(row, col),
- rect, hAlign, vAlign);
+ if ( value )
+ {
+ dc.SetTextForeground(attr.GetTextColour());
+ dc.DrawCheckMark(rectMark);
+ }
}
// ----------------------------------------------------------------------------
const wxColour& wxGridCellAttr::GetTextColour() const
{
if (HasTextColour())
+ {
return m_colText;
+ }
else if (m_defGridAttr != this)
+ {
return m_defGridAttr->GetTextColour();
- else {
+ }
+ else
+ {
wxFAIL_MSG(wxT("Missing default cell attribute"));
return wxNullColour;
}
return m_colBack;
else if (m_defGridAttr != this)
return m_defGridAttr->GetBackgroundColour();
- else {
+ else
+ {
wxFAIL_MSG(wxT("Missing default cell attribute"));
return wxNullColour;
}
return m_font;
else if (m_defGridAttr != this)
return m_defGridAttr->GetFont();
- else {
+ else
+ {
wxFAIL_MSG(wxT("Missing default cell attribute"));
return wxNullFont;
}
void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
{
- if (HasAlignment()) {
+ if (HasAlignment())
+ {
if ( hAlign ) *hAlign = m_hAlign;
if ( vAlign ) *vAlign = m_vAlign;
}
else if (m_defGridAttr != this)
m_defGridAttr->GetAlignment(hAlign, vAlign);
- else {
+ else
+ {
wxFAIL_MSG(wxT("Missing default cell attribute"));
}
}
-wxGridCellRenderer* wxGridCellAttr::GetRenderer() const
+// GetRenderer and GetEditor use a slightly different decision path about
+// which attribute to use. If a non-default attr object has one then it is
+// used, otherwise the default editor or renderer is fetched from the grid and
+// used. It should be the default for the data type of the cell. If it is
+// NULL (because the table has a type that the grid does not have in its
+// registry,) then the grid's default editor or renderer is used.
+
+wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col) const
{
- if (HasRenderer())
- return m_renderer;
- else if (m_defGridAttr != this)
- return m_defGridAttr->GetRenderer();
- else {
+ if ((m_defGridAttr != this || grid == NULL) && HasRenderer())
+ return m_renderer; // use local attribute
+
+ wxGridCellRenderer* renderer = NULL;
+ if (grid) // get renderer for the data type
+ renderer = grid->GetDefaultRendererForCell(row, col);
+
+ if (! renderer)
+ // if we still don't have one then use the grid default
+ renderer = m_defGridAttr->GetRenderer(NULL,0,0);
+
+ if (! renderer)
wxFAIL_MSG(wxT("Missing default cell attribute"));
- return NULL;
- }
+
+ return renderer;
}
-wxGridCellEditor* wxGridCellAttr::GetEditor() const
+wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
{
- if (HasEditor())
- return m_editor;
- else if (m_defGridAttr != this)
- return m_defGridAttr->GetEditor();
- else {
+ if ((m_defGridAttr != this || grid == NULL) && HasEditor())
+ return m_editor; // use local attribute
+
+ wxGridCellEditor* editor = NULL;
+ if (grid) // get renderer for the data type
+ editor = grid->GetDefaultEditorForCell(row, col);
+
+ if (! editor)
+ // if we still don't have one then use the grid default
+ editor = m_defGridAttr->GetEditor(NULL,0,0);
+
+ if (! editor)
wxFAIL_MSG(wxT("Missing default cell attribute"));
- return NULL;
- }
+
+ return editor;
}
// ----------------------------------------------------------------------------
}
}
+// ----------------------------------------------------------------------------
+// wxGridTypeRegistry
+// ----------------------------------------------------------------------------
+
+wxGridTypeRegistry::~wxGridTypeRegistry()
+{
+ for (size_t i=0; i<m_typeinfo.Count(); i++)
+ delete m_typeinfo[i];
+}
+
+
+void wxGridTypeRegistry::RegisterDataType(const wxString& typeName,
+ wxGridCellRenderer* renderer,
+ wxGridCellEditor* editor)
+{
+ int loc;
+ wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
+
+ // is it already registered?
+ if ((loc = FindDataType(typeName)) != -1) {
+ delete m_typeinfo[loc];
+ m_typeinfo[loc] = info;
+ }
+ else {
+ m_typeinfo.Add(info);
+ }
+}
+
+int wxGridTypeRegistry::FindDataType(const wxString& typeName)
+{
+ int found = -1;
+
+ for (size_t i=0; i<m_typeinfo.Count(); i++) {
+ if (typeName == m_typeinfo[i]->m_typeName) {
+ found = i;
+ break;
+ }
+ }
+
+ return found;
+}
+
+wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
+{
+ wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
+ return renderer;
+}
+
+wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
+{
+ wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
+ return editor;
+}
+
// ----------------------------------------------------------------------------
// wxGridTableBase
// ----------------------------------------------------------------------------
-//////////////////////////////////////////////////////////////////////
-//
-// Abstract base class for grid data (the model)
-//
IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
m_attrProvider = attrProvider;
}
+bool wxGridTableBase::CanHaveAttributes()
+{
+ if ( ! GetAttrProvider() )
+ {
+ // use the default attr provider by default
+ SetAttrProvider(new wxGridCellAttrProvider);
+ }
+ return TRUE;
+}
+
wxGridCellAttr *wxGridTableBase::GetAttr(int row, int col)
{
if ( m_attrProvider )
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;
}
}
+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) )
+{
+}
+
//////////////////////////////////////////////////////////////////////
//
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;
+ m_data[row][col] = value;
}
bool wxGridStringTable::IsEmptyCell( int row, int col )
wxRegion reg = GetUpdateRegion();
m_owner->CalcCellsExposed( reg );
m_owner->DrawGridCellArea( dc );
+ m_owner->DrawGridSpace( dc );
#if WXGRID_DRAW_LINES
m_owner->DrawAllGridLines( dc, reg );
#endif
+ m_owner->DrawHighlight( dc );
}
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
-void wxGridWindow::OnEraseBackground(wxEraseEvent&)
-{ }
-
+void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+{
+}
//////////////////////////////////////////////////////////////////////
const wxSize& size,
long style,
const wxString& name )
- : wxScrolledWindow( parent, id, pos, size, style, name )
+ : wxScrolledWindow( parent, id, pos, size, style, name ),
+ m_colMinWidths(wxKEY_INTEGER, GRID_HASH_SIZE)
{
Create();
}
if (m_ownTable)
delete m_table;
+
+ delete m_typeRegistry;
}
m_defaultCellAttr = new wxGridCellAttr;
m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
- // RD: Should we fill the default attrs now or is waiting until Init() okay?
+
+ // Set default cell attributes
+ m_defaultCellAttr->SetFont(GetFont());
+ m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
+ 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_rowLabelWidth = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;
+ // data type registration: register all standard data types
+ // TODO: may be allow the app to selectively disable some of them?
+ m_typeRegistry = new wxGridTypeRegistry;
+ RegisterDataType(wxGRID_VALUE_STRING,
+ new wxGridCellStringRenderer,
+ new wxGridCellTextEditor);
+ RegisterDataType(wxGRID_VALUE_BOOL,
+ new wxGridCellBoolRenderer,
+ new wxGridCellBoolEditor);
+ RegisterDataType(wxGRID_VALUE_NUMBER,
+ new wxGridCellNumberRenderer,
+ new wxGridCellNumberEditor);
+
+ // subwindow components that make up the wxGrid
m_cornerLabelWin = new wxGridCornerLabelWindow( this,
-1,
wxDefaultPosition,
void wxGrid::Init()
{
- int i;
-
if ( m_numRows <= 0 )
m_numRows = WXGRID_DEFAULT_NUMBER_ROWS;
m_defaultRowHeight += 4;
#endif
- m_rowHeights.Alloc( m_numRows );
- m_rowBottoms.Alloc( m_numRows );
- int rowBottom = 0;
- for ( i = 0; i < m_numRows; i++ )
- {
- m_rowHeights.Add( m_defaultRowHeight );
- rowBottom += m_defaultRowHeight;
- m_rowBottoms.Add( rowBottom );
- }
-
- m_colWidths.Alloc( m_numCols );
- m_colRights.Alloc( m_numCols );
- int colRight = 0;
- for ( i = 0; i < m_numCols; i++ )
- {
- m_colWidths.Add( m_defaultColWidth );
- colRight += m_defaultColWidth;
- m_colRights.Add( colRight );
- }
-
- // Set default cell attributes
- m_defaultCellAttr->SetFont(GetFont());
- m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
- m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
- m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
- m_defaultCellAttr->SetTextColour(
- wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
- m_defaultCellAttr->SetBackgroundColour(
- wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-
-
m_gridLineColour = wxColour( 128, 128, 255 );
m_gridLinesEnabled = TRUE;
m_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_inOnKeyDown = FALSE;
m_batchCount = 0;
+}
+
+// ----------------------------------------------------------------------------
+// the idea is to call these functions only when necessary because they create
+// quite big arrays which eat memory mostly unnecessary - in particular, if
+// default widths/heights are used for all rows/columns, we may not use these
+// arrays at all
+//
+// with some extra code, it should be possible to only store the
+// widths/heights different from default ones but this will be done later...
+// ----------------------------------------------------------------------------
+
+void wxGrid::InitRowHeights()
+{
+ m_rowHeights.Empty();
+ m_rowBottoms.Empty();
+
+ m_rowHeights.Alloc( m_numRows );
+ m_rowBottoms.Alloc( m_numRows );
+
+ int rowBottom = 0;
+ for ( int i = 0; i < m_numRows; i++ )
+ {
+ m_rowHeights.Add( m_defaultRowHeight );
+ rowBottom += m_defaultRowHeight;
+ m_rowBottoms.Add( rowBottom );
+ }
+}
+
+void wxGrid::InitColWidths()
+{
+ m_colWidths.Empty();
+ m_colRights.Empty();
+
+ m_colWidths.Alloc( m_numCols );
+ m_colRights.Alloc( m_numCols );
+ int colRight = 0;
+ for ( int i = 0; i < m_numCols; i++ )
+ {
+ m_colWidths.Add( m_defaultColWidth );
+ colRight += m_defaultColWidth;
+ m_colRights.Add( colRight );
+ }
+}
+
+int wxGrid::GetColWidth(int col) const
+{
+ return m_colWidths.IsEmpty() ? m_defaultColWidth : m_colWidths[col];
+}
+
+int wxGrid::GetColLeft(int col) const
+{
+ return m_colRights.IsEmpty() ? col * m_defaultColWidth
+ : m_colRights[col] - m_colWidths[col];
+}
+
+int wxGrid::GetColRight(int col) const
+{
+ return m_colRights.IsEmpty() ? (col + 1) * m_defaultColWidth
+ : m_colRights[col];
+}
+int wxGrid::GetRowHeight(int row) const
+{
+ return m_rowHeights.IsEmpty() ? m_defaultRowHeight : m_rowHeights[row];
+}
+
+int wxGrid::GetRowTop(int row) const
+{
+ return m_rowBottoms.IsEmpty() ? row * m_defaultRowHeight
+ : m_rowBottoms[row] - m_rowHeights[row];
}
+int wxGrid::GetRowBottom(int row) const
+{
+ return m_rowBottoms.IsEmpty() ? (row + 1) * m_defaultRowHeight
+ : m_rowBottoms[row];
+}
void wxGrid::CalcDimensions()
{
if ( m_numRows > 0 && m_numCols > 0 )
{
- int right = m_colRights[ m_numCols-1 ] + 50;
- int bottom = m_rowBottoms[ m_numRows-1 ] + 50;
+ int right = GetColRight( m_numCols-1 ) + 50;
+ int bottom = GetRowBottom( m_numRows-1 ) + 50;
// TODO: restore the scroll position that we had before sizing
//
{
int i;
+ // 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();
+ }
+
switch ( msg.GetId() )
{
case wxGRIDTABLE_NOTIFY_ROWS_INSERTED:
// 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 );
}
// 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 );
}
// find the cells within these bounds
//
int row, col;
- int colLeft, rowTop;
for ( row = 0; row < m_numRows; row++ )
{
- if ( m_rowBottoms[row] <= top ) continue;
+ if ( GetRowBottom(row) <= top )
+ continue;
- rowTop = m_rowBottoms[row] - m_rowHeights[row];
- if ( rowTop > bottom ) break;
+ if ( GetRowTop(row) > bottom )
+ break;
m_rowsExposed.Add( row );
for ( col = 0; col < m_numCols; col++ )
{
- if ( m_colRights[col] <= left ) continue;
+ if ( GetColRight(col) <= left )
+ continue;
- colLeft = m_colRights[col] - m_colWidths[col];
- if ( colLeft > right ) break;
+ if ( GetColLeft(col) > right )
+ break;
- if ( m_colsExposed.Index( col ) == wxNOT_FOUND ) m_colsExposed.Add( col );
+ if ( m_colsExposed.Index( col ) == wxNOT_FOUND )
+ m_colsExposed.Add( col );
m_cellsExposed.Add( wxGridCellCoords( row, col ) );
}
}
- iter++ ;
+ iter++;
}
}
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- y = wxMax( y,
- m_rowBottoms[m_dragRowOrCol] -
- m_rowHeights[m_dragRowOrCol] +
- WXGRID_MIN_ROW_HEIGHT );
+ y = wxMax( y, GetRowTop(m_dragRowOrCol) + WXGRID_MIN_ROW_HEIGHT );
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
{
row = YToRow(y);
if ( row >= 0 &&
- !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
+ !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
{
SelectRow( row, event.ShiftDown() );
ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
{
// starting to drag-resize a row
//
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
+ if ( CanDragRowSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin);
}
}
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 );
}
}
// Note: we are ending the event *after* doing
// default processing in this case
//
- SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+ SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
}
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_rowLabelWin);
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
}
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
}
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
// don't capture the mouse yet
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE);
+ if ( CanDragRowSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, m_rowLabelWin, FALSE);
}
}
else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- x = wxMax( x,
- m_colRights[m_dragRowOrCol] -
- m_colWidths[m_dragRowOrCol] +
- WXGRID_MIN_COL_WIDTH );
+
+ x = wxMax( x, GetColLeft(m_dragRowOrCol) +
+ GetColMinimalWidth(m_dragRowOrCol));
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
{
col = XToCol(x);
if ( col >= 0 &&
- !SendEvent( EVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
+ !SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
{
SelectCol( col, event.ShiftDown() );
ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
{
// starting to drag-resize a col
//
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);
+ if ( CanDragColSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin);
}
}
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 );
}
}
// Note: we are ending the event *after* doing
// default processing in this case
//
- SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+ SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
}
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
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
}
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
}
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
// don't capture the cursor yet
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE);
+ if ( CanDragColSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, m_colLabelWin, FALSE);
}
}
else if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
// 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();
}
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
}
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
}
// Don't start doing anything until the mouse has been drug at
// least 3 pixels in any direction...
- if (! m_isDragging) {
- if (m_startDragPos == wxDefaultPosition) {
+ if (! m_isDragging)
+ {
+ if (m_startDragPos == wxDefaultPosition)
+ {
m_startDragPos = pos;
return;
}
HideCellEditControl();
// Have we captured the mouse yet?
- if (! m_winCapture) {
+ if (! m_winCapture)
+ {
m_winCapture = m_gridWin;
m_winCapture->CaptureMouse();
}
SelectBlock( m_currentCellCoords, coords );
}
- if (! IsVisible(coords)) {
+ if (! IsVisible(coords))
+ {
MakeCellVisible(coords);
// TODO: need to introduce a delay or something here. The
// scrolling is way to fast, at least on MSW.
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- y = wxMax( y,
- m_rowBottoms[m_dragRowOrCol] -
- m_rowHeights[m_dragRowOrCol] +
- WXGRID_MIN_ROW_HEIGHT );
+ y = wxMax( y, GetRowTop(m_dragRowOrCol) + WXGRID_MIN_ROW_HEIGHT );
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- x = wxMax( x,
- m_colRights[m_dragRowOrCol] -
- m_colWidths[m_dragRowOrCol] + WXGRID_MIN_COL_WIDTH );
+ x = wxMax( x, GetColLeft(m_dragRowOrCol) +
+ GetColMinimalWidth(m_dragRowOrCol) );
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
m_isDragging = FALSE;
m_startDragPos = wxDefaultPosition;
+// if ( coords == wxGridNoCellCoords && m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+// {
+// ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+// }
- if ( coords != wxGridNoCellCoords )
- {
+// if ( coords != wxGridNoCellCoords )
+// {
// VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
// immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
// wxGTK
// ------------ Left button pressed
//
- if ( event.LeftDown() )
+ if ( event.LeftDown() && coords != wxGridNoCellCoords )
{
- EnableCellEditControl( FALSE );
+ DisableCellEditControl();
if ( event.ShiftDown() )
{
SelectBlock( m_currentCellCoords, coords );
else if ( XToEdgeOfCol(x) < 0 &&
YToEdgeOfRow(y) < 0 )
{
- if ( !SendEvent( EVT_GRID_CELL_LEFT_CLICK,
+ if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
coords.GetRow(),
coords.GetCol(),
event ) )
// if this is the second click on this cell then start
// the edit control
- if (m_waitForSlowClick && coords == m_currentCellCoords) {
- EnableCellEditControl(TRUE);
- // VZ: this is done by the call above, so why do it
- // again? please remove this line if it's ok
- //ShowCellEditControl();
+ if ( m_waitForSlowClick &&
+ (coords == m_currentCellCoords) &&
+ CanEnableCellControl())
+ {
+ EnableCellEditControl();
+
+ wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+ attr->GetEditor(this, coords.GetRow(), coords.GetCol())->StartingClick();
+ attr->DecRef();
+
m_waitForSlowClick = FALSE;
}
- else {
+ else
+ {
SetCurrentCell( coords );
m_waitForSlowClick = TRUE;
}
// ------------ Left double click
//
- else if ( event.LeftDClick() )
+ else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
{
- EnableCellEditControl( FALSE );
+ DisableCellEditControl();
if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
{
- SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
+ SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
coords.GetRow(),
coords.GetCol(),
event );
{
if ( IsSelection() )
{
- if (m_winCapture) {
+ if (m_winCapture)
+ {
m_winCapture->ReleaseMouse();
m_winCapture = NULL;
}
- SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event );
+ SendEvent( wxEVT_GRID_RANGE_SELECT, -1, -1, event );
}
// Show the edit control, if it has been hidden for
// Note: we are ending the event *after* doing
// default processing in this case
//
- SendEvent( EVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+ SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
}
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
{
// Note: we are ending the event *after* doing
// default processing in this case
//
- SendEvent( EVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
+ SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
}
m_dragLastPos = -1;
// ------------ Right button down
//
- else if ( event.RightDown() )
+ else if ( event.RightDown() && coords != wxGridNoCellCoords )
{
- EnableCellEditControl( FALSE );
- if ( !SendEvent( EVT_GRID_CELL_RIGHT_CLICK,
+ DisableCellEditControl();
+ if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
coords.GetRow(),
coords.GetCol(),
event ) )
// ------------ Right double click
//
- else if ( event.RightDClick() )
+ else if ( event.RightDClick() && coords != wxGridNoCellCoords )
{
- EnableCellEditControl( FALSE );
- if ( !SendEvent( EVT_GRID_CELL_RIGHT_DCLICK,
+ DisableCellEditControl();
+ if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
coords.GetRow(),
coords.GetCol(),
event ) )
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
+ if ( CanDragRowSize() && CanDragGridSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
}
return;
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
+ if ( CanDragColSize() && CanDragGridSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
}
return;
ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
}
}
- }
}
dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
HideCellEditControl();
- int rowTop = m_rowBottoms[m_dragRowOrCol] - m_rowHeights[m_dragRowOrCol];
+ int rowTop = GetRowTop(m_dragRowOrCol);
SetRowSize( m_dragRowOrCol,
wxMax( m_dragLastPos - rowTop, WXGRID_MIN_ROW_HEIGHT ) );
dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
HideCellEditControl();
- int colLeft = m_colRights[m_dragRowOrCol] - m_colWidths[m_dragRowOrCol];
+ int colLeft = GetColLeft(m_dragRowOrCol);
SetColSize( m_dragRowOrCol,
- wxMax( m_dragLastPos - colLeft, WXGRID_MIN_COL_WIDTH ) );
+ wxMax( m_dragLastPos - colLeft,
+ GetColMinimalWidth(m_dragRowOrCol) ) );
if ( !GetBatchCount() )
{
{
if ( m_table )
{
+ if (IsCellEditControlEnabled())
+ DisableCellEditControl();
+
m_table->Clear();
- SetEditControlValue();
if ( !GetBatchCount() ) m_gridWin->Refresh();
}
}
if ( m_table )
{
if (IsCellEditControlEnabled())
- EnableCellEditControl(FALSE);
+ DisableCellEditControl();
bool ok = m_table->InsertRows( pos, numRows );
if ( !GetBatchCount() ) Refresh();
}
- SetEditControlValue();
return ok;
}
else
if ( m_table )
{
if (IsCellEditControlEnabled())
- EnableCellEditControl(FALSE);
+ DisableCellEditControl();
if (m_table->DeleteRows( pos, numRows ))
{
if ( m_table )
{
if (IsCellEditControlEnabled())
- EnableCellEditControl(FALSE);
+ DisableCellEditControl();
bool ok = m_table->InsertCols( pos, numCols );
if ( !GetBatchCount() ) Refresh();
}
- SetEditControlValue();
return ok;
}
else
if ( m_table )
{
if (IsCellEditControlEnabled())
- EnableCellEditControl(FALSE);
+ DisableCellEditControl();
if ( m_table->DeleteCols( pos, numCols ) )
{
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);
return GetEventHandler()->ProcessEvent(gridEvt);
}
- else if ( type == EVT_GRID_RANGE_SELECT )
+ else if ( type == wxEVT_GRID_RANGE_SELECT )
{
wxGridRangeSelectEvent gridEvt( GetId(),
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);
m_numRows && m_numCols )
{
m_currentCellCoords.Set(0, 0);
- SetEditControlValue();
ShowCellEditControl();
}
default:
// now try the cell edit control
//
- if ( !IsCellEditControlEnabled() )
- EnableCellEditControl( TRUE );
- if (IsCellEditControlEnabled()) {
- wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
- attr->GetEditor()->StartingKey(event);
+ if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
+ {
+ EnableCellEditControl();
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ attr->GetEditor(this, row, col)->StartingKey(event);
attr->DecRef();
}
+ else
+ {
+ // let others process char events for readonly cells
+ event.Skip();
+ }
break;
}
}
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;
m_currentCellCoords != wxGridNoCellCoords )
{
HideCellEditControl();
- SaveEditControlValue();
- EnableCellEditControl(FALSE);
+ DisableCellEditControl();
// Clear the old current cell highlight
wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
m_currentCellCoords = coords;
- SetEditControlValue();
-
if ( m_displayed )
{
wxClientDC dc(m_gridWin);
PrepareDC(dc);
- DrawCellHighlight(dc);
+
+ wxGridCellAttr* attr = GetCellAttr(coords);
+ DrawCellHighlight(dc, attr);
+ attr->DecRef();
if ( IsSelection() )
{
}
+void wxGrid::DrawGridSpace( wxDC& dc )
+{
+ if ( m_numRows && m_numCols )
+ {
+ int cw, ch;
+ m_gridWin->GetClientSize( &cw, &ch );
+
+ int right, bottom;
+ CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+ if ( right > GetColRight(m_numCols-1) ||
+ bottom > GetRowBottom(m_numRows-1) )
+ {
+ int left, top;
+ CalcUnscrolledPosition( 0, 0, &left, &top );
+
+ dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+ dc.SetPen( *wxTRANSPARENT_PEN );
+
+ if ( right > GetColRight(m_numCols-1) )
+ dc.DrawRectangle( GetColRight(m_numCols-1)+1, top,
+ right - GetColRight(m_numCols-1), ch );
+
+ if ( bottom > GetRowBottom(m_numRows-1) )
+ dc.DrawRectangle( left, GetRowBottom(m_numRows-1)+1,
+ cw, bottom - GetRowBottom(m_numRows-1) );
+ }
+ }
+}
+
+
void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
{
int row = coords.GetRow();
int col = coords.GetCol();
- if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
// we draw the cell border ourselves
DrawCellBorder( dc, coords );
#endif
- // but all the rest is drawn by the cell renderer and hence may be
- // customized
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+
+ bool isCurrent = coords == m_currentCellCoords;
+
wxRect rect;
- rect.x = m_colRights[col] - m_colWidths[col];
- rect.y = m_rowBottoms[row] - m_rowHeights[row];
- rect.width = m_colWidths[col]-1;
- rect.height = m_rowHeights[row]-1;
+ rect.x = GetColLeft(col);
+ rect.y = GetRowTop(row);
+ rect.width = GetColWidth(col) - 1;
+ rect.height = GetRowHeight(row) - 1;
- wxGridCellAttr* attr = GetCellAttr(row, col);
- attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
- attr->DecRef();
+ // if the editor is shown, we should use it and not the renderer
+ if ( isCurrent && IsCellEditControlEnabled() )
+ {
+ attr->GetEditor(this, row, col)->PaintBackground(rect, attr);
+ }
+ else
+ {
+ // but all the rest is drawn by the cell renderer and hence may be
+ // customized
+ attr->GetRenderer(this, row, col)->
+ Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
- if (m_currentCellCoords == coords)
- DrawCellHighlight(dc);
-}
+ }
+ attr->DecRef();
+}
-void wxGrid::DrawCellHighlight( wxDC& dc )
+void wxGrid::DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr )
{
int row = m_currentCellCoords.GetRow();
int col = m_currentCellCoords.GetCol();
- if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
wxRect rect;
- rect.x = m_colRights[col] - m_colWidths[col];
- rect.y = m_rowBottoms[row] - m_rowHeights[row];
- rect.width = m_colWidths[col] - 1;
- rect.height = m_rowHeights[row] - 1;
-
- dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID));
+ rect.x = GetColLeft(col);
+ rect.y = GetRowTop(row);
+ rect.width = GetColWidth(col) - 1;
+ rect.height = GetRowHeight(row) - 1;
+
+ // hmmm... what could we do here to show that the cell is disabled?
+ // for now, I just draw a thinner border than for the other ones, but
+ // it doesn't look really good
+ dc.SetPen(wxPen(m_gridLineColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(rect);
+
+#if 0
+ // VZ: my experiments with 3d borders...
+
+ // how to properly set colours for arbitrary bg?
+ wxCoord x1 = rect.x,
+ y1 = rect.y,
+ x2 = rect.x + rect.width -1,
+ y2 = rect.y + rect.height -1;
+
+ dc.SetPen(*wxWHITE_PEN);
+ dc.DrawLine(x1, y1, x2, y1);
+ dc.DrawLine(x1, y1, x1, y2);
+
+ dc.DrawLine(x1 + 1, y2 - 1, x2 - 1, y2 - 1);
+ dc.DrawLine(x2 - 1, y1 + 1, x2 - 1, y2 );
+
+ dc.SetPen(*wxBLACK_PEN);
+ dc.DrawLine(x1, y2, x2, y2);
+ dc.DrawLine(x2, y1, x2, y2+1);
+#endif // 0
}
+
void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
{
- if ( m_colWidths[coords.GetCol()] <=0 ||
- m_rowHeights[coords.GetRow()] <= 0 ) return;
-
- dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
int row = coords.GetRow();
int col = coords.GetCol();
+ if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
+ return;
+
+ dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
// right hand border
//
- dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row],
- m_colRights[col], m_rowBottoms[row] );
+ dc.DrawLine( GetColRight(col), GetRowTop(row),
+ GetColRight(col), GetRowBottom(row) );
// bottom border
//
- dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row],
- m_colRights[col], m_rowBottoms[row] );
+ dc.DrawLine( GetColLeft(col), GetRowBottom(row),
+ GetColRight(col), GetRowBottom(row) );
}
+void wxGrid::DrawHighlight(wxDC& dc)
+{
+ if ( IsCellEditControlEnabled() )
+ {
+ // don't show highlight when the edit control is shown
+ return;
+ }
+
+ // if the active cell was repainted, repaint its highlight too because it
+ // might have been damaged by the grid lines
+ size_t count = m_cellsExposed.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ if ( m_cellsExposed[n] == m_currentCellCoords )
+ {
+ wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+ DrawCellHighlight(dc, attr);
+ attr->DecRef();
+
+ break;
+ }
+ }
+}
// TODO: remove this ???
// This is used to redraw all grid lines e.g. when the grid line colour
int top, bottom, left, right;
- if (reg.IsEmpty()){
+#ifndef __WXGTK__
+ if (reg.IsEmpty())
+ {
int cw, ch;
m_gridWin->GetClientSize(&cw, &ch);
CalcUnscrolledPosition( 0, 0, &left, &top );
CalcUnscrolledPosition( cw, ch, &right, &bottom );
}
- else{
+ else
+ {
wxCoord x, y, w, h;
reg.GetBox(x, y, w, h);
CalcUnscrolledPosition( x, y, &left, &top );
CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
}
+#else
+ int cw, ch;
+ m_gridWin->GetClientSize(&cw, &ch);
+ CalcUnscrolledPosition( 0, 0, &left, &top );
+ CalcUnscrolledPosition( cw, ch, &right, &bottom );
+#endif
// avoid drawing grid lines past the last row and col
//
- right = wxMin( right, m_colRights[m_numCols-1] );
- bottom = wxMin( bottom, m_rowBottoms[m_numRows-1] );
+ right = wxMin( right, GetColRight(m_numCols - 1) );
+ bottom = wxMin( bottom, GetRowBottom(m_numRows - 1) );
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );
int i;
for ( i = 0; i < m_numRows; i++ )
{
- if ( m_rowBottoms[i]-1 > bottom )
+ int bot = GetRowBottom(i) - 1;
+
+ if ( bot > bottom )
{
break;
}
- else if ( m_rowBottoms[i]-1 >= top )
+
+ if ( bot >= top )
{
- dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 );
+ dc.DrawLine( left, bot, right, bot );
}
}
//
for ( i = 0; i < m_numCols; i++ )
{
- if ( m_colRights[i]-1 > right )
+ int colRight = GetColRight(i) - 1;
+ if ( colRight > right )
{
break;
}
- else if ( m_colRights[i]-1 >= left )
+
+ if ( colRight >= left )
{
- dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom );
+ dc.DrawLine( colRight, top, colRight, bottom );
}
}
}
void wxGrid::DrawRowLabel( wxDC& dc, int row )
{
- if ( m_rowHeights[row] <= 0 ) return;
+ if ( GetRowHeight(row) <= 0 )
+ return;
- int rowTop = m_rowBottoms[row] - m_rowHeights[row];
+ int rowTop = GetRowTop(row),
+ rowBottom = GetRowBottom(row) - 1;
dc.SetPen( *wxBLACK_PEN );
dc.DrawLine( m_rowLabelWidth-1, rowTop,
- m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+ m_rowLabelWidth-1, rowBottom );
- dc.DrawLine( 0, m_rowBottoms[row]-1,
- m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+ dc.DrawLine( 0, rowBottom, m_rowLabelWidth-1, rowBottom );
dc.SetPen( *wxWHITE_PEN );
- dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 );
+ dc.DrawLine( 0, rowTop, 0, rowBottom );
dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );
dc.SetBackgroundMode( wxTRANSPARENT );
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::DrawColLabel( wxDC& dc, int col )
{
- if ( m_colWidths[col] <= 0 ) return;
+ if ( GetColWidth(col) <= 0 )
+ return;
- int colLeft = m_colRights[col] - m_colWidths[col];
+ int colLeft = GetColLeft(col),
+ colRight = GetColRight(col) - 1;
dc.SetPen( *wxBLACK_PEN );
- dc.DrawLine( m_colRights[col]-1, 0,
- m_colRights[col]-1, m_colLabelHeight-1 );
+ dc.DrawLine( colRight, 0,
+ colRight, m_colLabelHeight-1 );
dc.DrawLine( colLeft, m_colLabelHeight-1,
- m_colRights[col]-1, m_colLabelHeight-1 );
+ colRight, m_colLabelHeight-1 );
dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
- dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 );
+ dc.DrawLine( colLeft, 0, colRight, 0 );
dc.SetBackgroundMode( wxTRANSPARENT );
dc.SetTextForeground( GetLabelTextColour() );
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 );
}
{
m_editable = edit;
+ // FIXME IMHO this won't disable the edit control if edit == FALSE
+ // because of the check in the beginning of
+ // EnableCellEditControl() just below (VZ)
EnableCellEditControl(m_editable);
}
}
if ( enable != m_cellEditCtrlEnabled )
{
+ // TODO allow the app to Veto() this event?
+ SendEvent(enable ? wxEVT_GRID_EDITOR_SHOWN : wxEVT_GRID_EDITOR_HIDDEN);
+
if ( enable )
{
+ // this should be checked by the caller!
+ wxASSERT_MSG( CanEnableCellControl(),
+ _T("can't enable editing for this cell!") );
+
+ // do it before ShowCellEditControl()
m_cellEditCtrlEnabled = enable;
- SetEditControlValue();
+
ShowCellEditControl();
}
else
{
HideCellEditControl();
SaveEditControlValue();
+
+ // do it after HideCellEditControl()
m_cellEditCtrlEnabled = enable;
}
}
}
+bool wxGrid::IsCurrentCellReadOnly() const
+{
+ // const_cast
+ wxGridCellAttr* attr = ((wxGrid *)this)->GetCellAttr(m_currentCellCoords);
+ bool readonly = attr->IsReadOnly();
+ attr->DecRef();
+
+ return readonly;
+}
+
+bool wxGrid::CanEnableCellControl() const
+{
+ return m_editable && !IsCurrentCellReadOnly();
+}
+
+bool wxGrid::IsCellEditControlEnabled() const
+{
+ // the cell edit control might be disable for all cells or just for the
+ // current one if it's read only
+ return m_cellEditCtrlEnabled ? !IsCurrentCellReadOnly() : FALSE;
+}
void wxGrid::ShowCellEditControl()
{
// convert to scrolled coords
//
- int left, top, right, bottom;
- CalcScrolledPosition( rect.GetLeft(), rect.GetTop(), &left, &top );
- CalcScrolledPosition( rect.GetRight(), rect.GetBottom(), &right, &bottom );
- left--; top--; right--; bottom--; // cell is shifted by one pixel
- int cw, ch;
- m_gridWin->GetClientSize( &cw, &ch );
+ CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
- // Make the edit control large enough to allow for internal
- // margins
- //
- // TODO: remove this if the text ctrl sizing is improved esp. for
- // unix
- //
- int extra;
-#if defined(__WXMOTIF__)
- if ( row == 0 || col == 0 )
- {
- extra = 2;
- }
- else
- {
- extra = 4;
- }
-#else
- if ( row == 0 || col == 0 )
- {
- extra = 1;
- }
- else
- {
- extra = 2;
- }
-#endif
+ // done in PaintBackground()
+#if 0
+ // erase the highlight and the cell contents because the editor
+ // might not cover the entire cell
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ dc.SetBrush(*wxLIGHT_GREY_BRUSH); //wxBrush(attr->GetBackgroundColour(), wxSOLID));
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.DrawRectangle(rect);
+#endif // 0
-#if defined(__WXGTK__)
- int top_diff = 0;
- int left_diff = 0;
- if (left != 0) left_diff++;
- if (top != 0) top_diff++;
- rect.SetLeft( left + left_diff );
- rect.SetTop( top + top_diff );
- rect.SetRight( rect.GetRight() - left_diff );
- rect.SetBottom( rect.GetBottom() - top_diff );
-#else
- rect.SetLeft( wxMax(0, left - extra) );
- rect.SetTop( wxMax(0, top - extra) );
- rect.SetRight( rect.GetRight() + 2*extra );
- rect.SetBottom( rect.GetBottom() + 2*extra );
-#endif
+ // cell is shifted by one pixel
+ rect.x--;
+ rect.y--;
- wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellEditor* editor = attr->GetEditor();
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ wxGridCellEditor* editor = attr->GetEditor(this, row, col);
if ( !editor->IsCreated() )
{
editor->Create(m_gridWin, -1,
}
editor->SetSize( rect );
+
editor->Show( TRUE, attr );
editor->BeginEdit(row, col, this);
attr->DecRef();
int col = m_currentCellCoords.GetCol();
wxGridCellAttr* attr = GetCellAttr(row, col);
- attr->GetEditor()->Show( FALSE );
+ attr->GetEditor(this, row, col)->Show( FALSE );
attr->DecRef();
m_gridWin->SetFocus();
}
}
-void wxGrid::SetEditControlValue( const wxString& value )
-{
- // RD: The new Editors get the value from the table themselves now. This
- // method can probably be removed...
-}
-
-
void wxGrid::SaveEditControlValue()
{
if ( IsCellEditControlEnabled() )
int col = m_currentCellCoords.GetCol();
wxGridCellAttr* attr = GetCellAttr(row, col);
- bool changed = attr->GetEditor()->EndEdit(row, col, TRUE, this);
+ wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+ bool changed = editor->EndEdit(row, col, this);
attr->DecRef();
if (changed)
{
- SendEvent( EVT_GRID_CELL_CHANGE,
+ SendEvent( wxEVT_GRID_CELL_CHANGE,
m_currentCellCoords.GetRow(),
m_currentCellCoords.GetCol() );
}
for ( i = 0; i < m_numRows; i++ )
{
- if ( y < m_rowBottoms[i] ) return i;
+ if ( y < GetRowBottom(i) )
+ return i;
}
- return m_numRows; //-1;
+ return -1;
}
for ( i = 0; i < m_numCols; i++ )
{
- if ( x < m_colRights[i] ) return i;
+ if ( x < GetColRight(i) )
+ return i;
}
- return m_numCols; //-1;
+ return -1;
}
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;
}
}
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;
}
}
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);
}
return rect;
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
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
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 )
{
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 )
{
{
wxCHECK_MSG( row >= 0 && row < m_numRows, 0, _T("invalid row index") );
- return m_rowHeights[row];
+ return GetRowHeight(row);
}
int wxGrid::GetDefaultColSize()
{
wxCHECK_MSG( col >= 0 && col < m_numCols, 0, _T("invalid column index") );
- return m_colWidths[col];
+ return GetColWidth(col);
}
// ============================================================================
void wxGrid::SetDefaultCellBackgroundColour( const wxColour& col )
{
m_defaultCellAttr->SetBackgroundColour(col);
+#ifdef __WXGTK__
+ m_gridWin->SetBackgroundColour(col);
+#endif
}
void wxGrid::SetDefaultCellTextColour( const wxColour& col )
wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
{
- return m_defaultCellAttr->GetRenderer();
+ return m_defaultCellAttr->GetRenderer(NULL,0,0);
}
wxGridCellEditor *wxGrid::GetDefaultEditor() const
{
- return m_defaultCellAttr->GetEditor();
+ return m_defaultCellAttr->GetEditor(NULL,0,0);
}
// ----------------------------------------------------------------------------
wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
{
wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellRenderer* renderer = attr->GetRenderer();
+ wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
attr->DecRef();
return renderer;
}
wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
{
wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellEditor* editor = attr->GetEditor();
+ 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, ...
// ----------------------------------------------------------------------------
return FALSE;
}
- // RD: Maybe m_table->CanHaveAttributes() would be better in case the
- // table is providing the attributes itself??? In which case
- // I don't think the grid should create a Provider object for the
- // table but the table should be smart enough to do that on its own.
- if ( !m_table->GetAttrProvider() )
- {
- // use the default attr provider by default
- // (another choice would be to just return FALSE thus forcing the user
- // to it himself)
- m_table->SetAttrProvider(new wxGridCellAttrProvider);
- }
-
- return TRUE;
+ return m_table->CanHaveAttributes();
}
void wxGrid::ClearAttrCache()
attr = m_table ? m_table->GetAttr(row, col) : (wxGridCellAttr *)NULL;
CacheAttr(row, col, attr);
}
- if (attr) {
+ if (attr)
+ {
attr->SetDefAttr(m_defaultCellAttr);
- } else {
+ }
+ else
+ {
attr = m_defaultCellAttr;
attr->IncRef();
}
}
}
+void wxGrid::SetReadOnly(int row, int col, bool isReadOnly)
+{
+ if ( CanHaveAttributes() )
+ {
+ wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
+ attr->SetReadOnly(isReadOnly);
+ attr->DecRef();
+ }
+}
+
+// ----------------------------------------------------------------------------
+// Data type registration
+// ----------------------------------------------------------------------------
+
+void wxGrid::RegisterDataType(const wxString& typeName,
+ wxGridCellRenderer* renderer,
+ wxGridCellEditor* editor)
+{
+ m_typeRegistry->RegisterDataType(typeName, renderer, editor);
+}
+
+
+wxGridCellEditor* wxGrid::GetDefaultEditorForCell(int row, int col) const
+{
+ wxString typeName = m_table->GetTypeName(row, col);
+ return GetDefaultEditorForType(typeName);
+}
+
+wxGridCellRenderer* wxGrid::GetDefaultRendererForCell(int row, int col) const
+{
+ wxString typeName = m_table->GetTypeName(row, col);
+ return GetDefaultRendererForType(typeName);
+}
+
+wxGridCellEditor*
+wxGrid::GetDefaultEditorForType(const wxString& typeName) const
+{
+ int index = m_typeRegistry->FindDataType(typeName);
+ if (index == -1) {
+ // Should we force the failure here or let it fallback to string handling???
+ // wxFAIL_MSG(wxT("Unknown data type name"));
+ return NULL;
+ }
+ return m_typeRegistry->GetEditor(index);
+}
+
+wxGridCellRenderer*
+wxGrid::GetDefaultRendererForType(const wxString& typeName) const
+{
+ int index = m_typeRegistry->FindDataType(typeName);
+ if (index == -1) {
+ // Should we force the failure here or let it fallback to string handling???
+ // wxFAIL_MSG(wxT("Unknown data type name"));
+ return NULL;
+ }
+ return m_typeRegistry->GetRenderer(index);
+}
+
+
// ----------------------------------------------------------------------------
// row/col size
// ----------------------------------------------------------------------------
+void wxGrid::EnableDragRowSize( bool enable )
+{
+ m_canDragRowSize = enable;
+}
+
+
+void wxGrid::EnableDragColSize( bool enable )
+{
+ m_canDragColSize = enable;
+}
+
+void wxGrid::EnableDragGridSize( bool enable )
+{
+ m_canDragGridSize = enable;
+}
+
+
void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
{
m_defaultRowHeight = wxMax( height, WXGRID_MIN_ROW_HEIGHT );
if ( resizeExistingRows )
{
- int row;
- int bottom = 0;
- for ( row = 0; row < m_numRows; row++ )
- {
- m_rowHeights[row] = m_defaultRowHeight;
- bottom += m_defaultRowHeight;
- m_rowBottoms[row] = bottom;
- }
+ InitRowHeights();
+
CalcDimensions();
}
}
{
wxCHECK_RET( row >= 0 && row < m_numRows, _T("invalid row index") );
- int i;
+ if ( m_rowHeights.IsEmpty() )
+ {
+ // need to really create the array
+ InitRowHeights();
+ }
int h = wxMax( 0, height );
int diff = h - m_rowHeights[row];
m_rowHeights[row] = h;
+ int i;
for ( i = row; i < m_numRows; i++ )
{
m_rowBottoms[i] += diff;
if ( resizeExistingCols )
{
- int col;
- int right = 0;
- for ( col = 0; col < m_numCols; col++ )
- {
- m_colWidths[col] = m_defaultColWidth;
- right += m_defaultColWidth;
- m_colRights[col] = right;
- }
+ InitColWidths();
+
CalcDimensions();
}
}
{
wxCHECK_RET( col >= 0 && col < m_numCols, _T("invalid column index") );
- int i;
+ // should we check that it's bigger than GetColMinimalWidth(col) here?
+
+ if ( m_colWidths.IsEmpty() )
+ {
+ // need to really create the array
+ InitColWidths();
+ }
int w = wxMax( 0, width );
int diff = w - m_colWidths[col];
m_colWidths[col] = w;
+ int i;
for ( i = col; i < m_numCols; i++ )
{
m_colRights[i] += diff;
}
+void wxGrid::SetColMinimalWidth( int col, int width )
+{
+ m_colMinWidths.Put(col, (wxObject *)width);
+}
+
+int wxGrid::GetColMinimalWidth(int col) const
+{
+ wxObject *obj = m_colMinWidths.Get(m_dragRowOrCol);
+ return obj ? (int)obj : WXGRID_MIN_COL_WIDTH;
+}
+
+void wxGrid::AutoSizeColumn( int col, bool setAsMin )
+{
+ wxClientDC dc(m_gridWin);
+
+ wxCoord width, widthMax = 0;
+ for ( int row = 0; row < m_numRows; row++ )
+ {
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
+ if ( renderer )
+ {
+ width = renderer->GetBestSize(*this, *attr, dc, row, col).x;
+ if ( width > widthMax )
+ {
+ widthMax = width;
+ }
+ }
+
+ attr->DecRef();
+ }
+
+ // now also compare with the column label width
+ dc.SetFont( GetLabelFont() );
+ dc.GetTextExtent( GetColLabelValue(col), &width, NULL );
+ if ( width > widthMax )
+ {
+ widthMax = width;
+ }
+
+ if ( !widthMax )
+ {
+ // empty column - give default width (notice that if widthMax is less
+ // than default width but != 0, it's ok)
+ widthMax = m_defaultColWidth;
+ }
+ else
+ {
+ // leave some space around text
+ widthMax += 10;
+ }
+
+ SetColSize(col, widthMax);
+ if ( setAsMin )
+ {
+ SetColMinimalWidth(col, widthMax);
+ }
+}
+
+void wxGrid::AutoSizeColumns( bool setAsMin )
+{
+ for ( int col = 0; col < m_numCols; col++ )
+ {
+ AutoSizeColumn(col, setAsMin);
+ }
+}
+
//
// ------ cell value accessor functions
//
DrawCell( dc, wxGridCellCoords(row, col) );
}
-#if 0 // TODO: edit in place
-
if ( m_currentCellCoords.GetRow() == row &&
- m_currentCellCoords.GetCol() == col )
+ m_currentCellCoords.GetCol() == col &&
+ IsCellEditControlEnabled())
{
- SetEditControlValue( s );
+ HideCellEditControl();
+ ShowCellEditControl(); // will reread data from table
}
-#endif
-
}
}
if ( IsSelection() && addToSelected )
{
wxRect rect[4];
- bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
+
int i;
wxCoord oldLeft = m_selectedTopLeft.GetCol();
}
wxGridRangeSelectEvent gridEvt( GetId(),
- EVT_GRID_RANGE_SELECT,
+ wxEVT_GRID_RANGE_SELECT,
this,
m_selectedTopLeft,
m_selectedBottomRight );
if ( IsSelection() && addToSelected )
{
wxRect rect[4];
- bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
int i;
wxCoord oldLeft = m_selectedTopLeft.GetCol();
}
wxGridRangeSelectEvent gridEvt( GetId(),
- EVT_GRID_RANGE_SELECT,
+ wxEVT_GRID_RANGE_SELECT,
this,
m_selectedTopLeft,
m_selectedBottomRight );
// Either one rectangle is a real subset of the
// other, or they are (almost) disjoint!
wxRect rect[4];
- bool need_refresh[4] = { FALSE, FALSE, FALSE, FALSE };
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
int i;
// Store intermediate values
if ( !m_isDragging )
{
wxGridRangeSelectEvent gridEvt( GetId(),
- EVT_GRID_RANGE_SELECT,
+ wxEVT_GRID_RANGE_SELECT,
this,
m_selectedTopLeft,
m_selectedBottomRight );
projects / wxWidgets.git / blobdiff