#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"
#include "wx/log.h"
#include "wx/textctrl.h"
#include "wx/checkbox.h"
+ #include "wx/combobox.h"
#include "wx/valtext.h"
#endif
#include "wx/textfile.h"
#include "wx/spinctrl.h"
+#include "wx/tokenzr.h"
#include "wx/grid.h"
+#include "wx/generic/gridsel.h"
+
+#if defined(__WXMOTIF__)
+ #define WXUNUSED_MOTIF(identifier) WXUNUSED(identifier)
+#else
+ #define WXUNUSED_MOTIF(identifier) identifier
+#endif
+
+#if defined(__WXGTK__)
+ #define WXUNUSED_GTK(identifier) WXUNUSED(identifier)
+#else
+ #define WXUNUSED_GTK(identifier) identifier
+#endif
+
+// Required for wxIs... functions
+#include <ctype.h>
// ----------------------------------------------------------------------------
// array classes
// ----------------------------------------------------------------------------
-WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs);
+WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);
struct wxGridCellWithAttr
{
wxGridCellAttr *attr;
};
-WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
+WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
#include "wx/arrimpl.cpp"
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
+ void OnKeyUp( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridRowLabelWindow)
DECLARE_EVENT_TABLE()
void OnPaint( wxPaintEvent &event );
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
+ void OnKeyUp( wxKeyEvent& );
DECLARE_DYNAMIC_CLASS(wxGridColLabelWindow)
DECLARE_EVENT_TABLE()
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
+ void OnKeyUp( wxKeyEvent& );
void OnPaint( wxPaintEvent& event );
DECLARE_DYNAMIC_CLASS(wxGridCornerLabelWindow)
void OnPaint( wxPaintEvent &event );
void OnMouseEvent( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& );
+ void OnKeyUp( wxKeyEvent& );
void OnEraseBackground( wxEraseEvent& );
// data structures used for the data type registry
// ----------------------------------------------------------------------------
-struct wxGridDataTypeInfo {
+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; }
+ ~wxGridDataTypeInfo()
+ {
+ wxSafeDecRef(m_renderer);
+ wxSafeDecRef(m_editor);
+ }
wxString m_typeName;
wxGridCellRenderer* m_renderer;
};
-WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
+WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
-class WXDLLEXPORT wxGridTypeRegistry {
+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);
wxGridDataTypeInfoArray m_typeinfo;
};
-
-
-
// ----------------------------------------------------------------------------
// conditional compilation
// ----------------------------------------------------------------------------
{
if (m_control)
{
+ m_control->PopEventHandler(TRUE /* delete it*/);
+
m_control->Destroy();
m_control = NULL;
}
{
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)
event.Skip();
}
+bool wxGridCellEditor::IsAcceptedKey(wxKeyEvent& event)
+{
+ // accept the simple key presses, not anything with Ctrl/Alt/Meta
+ return !event.HasModifiers();
+}
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
{
wxGridCellTextEditor::wxGridCellTextEditor()
{
+ m_maxChars = 0;
}
void wxGridCellTextEditor::Create(wxWindow* parent,
m_control = new wxTextCtrl(parent, id, wxEmptyString,
wxDefaultPosition, wxDefaultSize
#if defined(__WXMSW__)
- , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ???
+ , wxTE_MULTILINE | wxTE_NO_VSCROLL | wxTE_AUTO_SCROLL
#endif
);
+ // TODO: use m_maxChars
+
wxGridCellEditor::Create(parent, id, evtHandler);
}
// unix
//
#if defined(__WXGTK__)
- rect.Inflate(rect.x ? 1 : 0, rect.y ? 1 : 0);
+ if (rect.x != 0)
+ {
+ rect.x += 1;
+ rect.y += 1;
+ rect.width -= 1;
+ rect.height -= 1;
+ }
#else // !GTK
- int extra = row && col ? 2 : 1;
+ 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 *= 2;
+ extra_x *= 2;
+ extra_y *= 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 );
+ 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);
Text()->SetFocus();
}
-bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue,
+bool wxGridCellTextEditor::EndEdit(int row, int col,
wxGrid* grid)
{
wxASSERT_MSG(m_control,
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)
{
- 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);
- }
+ // 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;
- Text()->AppendText((wxChar)keycode);
+ case WXK_ADD:
+ case WXK_NUMPAD_ADD:
+ ch = _T('+');
+ break;
- return;
- }
+ 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');
+ }
}
- event.Skip();
+ if ( ch )
+ {
+ Text()->AppendText(ch);
+ }
+ else
+ {
+ event.Skip();
+ }
}
-void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
+void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
+ WXUNUSED_GTK(WXUNUSED_MOTIF(event)) )
{
#if defined(__WXMOTIF__) || defined(__WXGTK__)
// wxMotif needs a little extra help...
- int pos = Text()->GetInsertionPoint();
+ size_t pos = (size_t)( Text()->GetInsertionPoint() );
wxString s( Text()->GetValue() );
s = s.Left(pos) + "\n" + s.Mid(pos);
Text()->SetValue(s);
#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
// ----------------------------------------------------------------------------
wxGridCellTextEditor::Create(parent, id, evtHandler);
#if wxUSE_VALIDATORS
- Text()->SetValidator(new wxTextValidator(wxFILTER_NUMERIC));
+ Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
#endif // wxUSE_VALIDATORS
}
}
}
else
{
- wxFAIL_MSG( _T("this cell doesn't have numeric value") );
-
- return;
+ 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(m_valueOld);
+ Spin()->SetValue((int)m_valueOld);
+ Spin()->SetFocus();
}
else
{
}
}
-bool wxGridCellNumberEditor::EndEdit(int row, int col, bool saveValue,
+bool wxGridCellNumberEditor::EndEdit(int row, int col,
wxGrid* grid)
{
bool changed;
if ( changed )
{
- grid->GetTable()->SetValueAsLong(row, col, value);
+ 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;
{
if ( HasRange() )
{
- Spin()->SetValue(m_valueOld);
+ Spin()->SetValue((int)m_valueOld);
}
else
{
}
}
+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() )
{
- long keycode = event.KeyCode();
+ int keycode = (int) event.KeyCode();
if ( isdigit(keycode) || keycode == '+' || keycode == '-' )
{
wxGridCellTextEditor::StartingKey(event);
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(new wxTextValidator(wxFILTER_NUMERIC));
+ Text()->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
#endif // wxUSE_VALIDATORS
}
}
else
{
- wxFAIL_MSG( _T("this cell doesn't have float value") );
-
- return;
+ 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, bool saveValue,
+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);
+ 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;
}
void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
{
- long keycode = event.KeyCode();
+ int keycode = (int)event.KeyCode();
if ( isdigit(keycode) ||
keycode == '+' || keycode == '-' || keycode == '.' )
{
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::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?)
- wxCoord w, h;
- m_control->GetSize(&w, &h);
+#if defined(__WXGTK__) || defined (__WXMOTIF__)
// 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
+ 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 - w/2, r.y + r.height/2 - h/2);
+ 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)
wxASSERT_MSG(m_control,
wxT("The wxGridCellEditor must be Created first!"));
- if (grid->GetTable()->CanGetValueAs(row, col, wxT("bool")))
+ if (grid->GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL))
m_startValue = grid->GetTable()->GetValueAsBool(row, col);
else
- m_startValue = !!grid->GetTable()->GetValue(row, col);
+ {
+ wxString cellval( grid->GetTable()->GetValue(row, col) );
+ m_startValue = !( !cellval || (cellval == "0") );
+ }
CBox()->SetValue(m_startValue);
CBox()->SetFocus();
}
bool wxGridCellBoolEditor::EndEdit(int row, int col,
- bool saveValue,
wxGrid* grid)
{
wxASSERT_MSG(m_control,
if ( changed )
{
- if (grid->GetTable()->CanGetValueAs(row, col, wxT("bool")))
+ 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);
CBox()->SetValue(!CBox()->GetValue());
}
-// ----------------------------------------------------------------------------
-// wxGridCellEditorEvtHandler
-// ----------------------------------------------------------------------------
-
-void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
+bool wxGridCellBoolEditor::IsAcceptedKey(wxKeyEvent& event)
{
- switch ( event.KeyCode() )
+ if ( wxGridCellEditor::IsAcceptedKey(event) )
{
- case WXK_ESCAPE:
- m_editor->Reset();
- m_grid->DisableCellEditControl();
- break;
-
- case WXK_TAB:
- event.Skip( m_grid->ProcessEvent( event ) );
- break;
-
- case WXK_RETURN:
- if (!m_grid->ProcessEvent(event))
- m_editor->HandleReturn(event);
- break;
-
-
- default:
- event.Skip();
+ 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;
}
-void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
+// ----------------------------------------------------------------------------
+// wxGridCellChoiceEditor
+// ----------------------------------------------------------------------------
+
+wxGridCellChoiceEditor::wxGridCellChoiceEditor(size_t count,
+ const wxString choices[],
+ bool allowOthers)
+ : m_allowOthers(allowOthers)
{
- switch ( event.KeyCode() )
+ if ( count )
{
- case WXK_ESCAPE:
- case WXK_TAB:
- case WXK_RETURN:
- break;
-
- default:
- event.Skip();
+ m_choices.Alloc(count);
+ for ( size_t n = 0; n < count; n++ )
+ {
+ m_choices.Add(choices[n]);
+ }
}
}
-// ============================================================================
-// renderer classes
-// ============================================================================
+wxGridCellEditor *wxGridCellChoiceEditor::Clone() const
+{
+ wxGridCellChoiceEditor *editor = new wxGridCellChoiceEditor;
+ editor->m_allowOthers = m_allowOthers;
+ editor->m_choices = m_choices;
-// ----------------------------------------------------------------------------
-// wxGridCellRenderer
-// ----------------------------------------------------------------------------
+ return editor;
+}
-void wxGridCellRenderer::Draw(wxGrid& grid,
- wxGridCellAttr& attr,
- wxDC& dc,
- const wxRect& rect,
- int row, int col,
- bool isSelected)
+void wxGridCellChoiceEditor::Create(wxWindow* parent,
+ wxWindowID id,
+ wxEvtHandler* evtHandler)
{
- dc.SetBackgroundMode( wxSOLID );
-
- if ( isSelected )
- {
- dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
- }
- else
+ size_t count = m_choices.GetCount();
+ wxString *choices = new wxString[count];
+ for ( size_t n = 0; n < count; n++ )
{
- dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ choices[n] = m_choices[n];
}
- dc.SetPen( *wxTRANSPARENT_PEN );
- dc.DrawRectangle(rect);
-}
+ m_control = new wxComboBox(parent, id, wxEmptyString,
+ wxDefaultPosition, wxDefaultSize,
+ count, choices,
+ m_allowOthers ? 0 : wxCB_READONLY);
-wxGridCellRenderer::~wxGridCellRenderer()
-{
+ 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; 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();
+}
+
+void wxGridCellChoiceEditor::SetParameters(const wxString& params)
+{
+ if ( !params )
+ {
+ // what can we do?
+ return;
+ }
+
+ m_choices.Empty();
+
+ wxStringTokenizer tk(params, _T(','));
+ while ( tk.HasMoreTokens() )
+ {
+ m_choices.Add(tk.GetNextToken());
+ }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellEditorEvtHandler
+// ----------------------------------------------------------------------------
+
+void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
+{
+ switch ( event.KeyCode() )
+ {
+ case WXK_ESCAPE:
+ m_editor->Reset();
+ m_grid->DisableCellEditControl();
+ break;
+
+ case WXK_TAB:
+ event.Skip( m_grid->ProcessEvent( event ) );
+ break;
+
+ case WXK_RETURN:
+ if (!m_grid->ProcessEvent(event))
+ m_editor->HandleReturn(event);
+ break;
+
+
+ default:
+ event.Skip();
+ }
+}
+
+void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
+{
+ switch ( event.KeyCode() )
+ {
+ case WXK_ESCAPE:
+ case WXK_TAB:
+ case WXK_RETURN:
+ break;
+
+ default:
+ event.Skip();
+ }
+}
+
+// ----------------------------------------------------------------------------
+// wxGridCellWorker is an (almost) empty common base class for
+// wxGridCellRenderer and wxGridCellEditor managing ref counting
+// ----------------------------------------------------------------------------
+
+void wxGridCellWorker::SetParameters(const wxString& WXUNUSED(params))
+{
+ // nothing to do
+}
+
+wxGridCellWorker::~wxGridCellWorker()
+{
+}
+
+// ============================================================================
+// renderer classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxGridCellRenderer
+// ----------------------------------------------------------------------------
+
+void wxGridCellRenderer::Draw(wxGrid& grid,
+ wxGridCellAttr& attr,
+ wxDC& dc,
+ const wxRect& rect,
+ int WXUNUSED(row), int WXUNUSED(col),
+ bool isSelected)
+{
+ dc.SetBackgroundMode( wxSOLID );
+
+ if ( isSelected )
+ {
+ dc.SetBrush( wxBrush(grid.GetSelectionBackground(), wxSOLID) );
+ }
+ else
+ {
+ dc.SetBrush( wxBrush(attr.GetBackgroundColour(), wxSOLID) );
+ }
+
+ dc.SetPen( *wxTRANSPARENT_PEN );
+ dc.DrawRectangle(rect);
+}
+
+// ----------------------------------------------------------------------------
// wxGridCellStringRenderer
// ----------------------------------------------------------------------------
wxDC& dc,
const wxString& text)
{
- wxCoord x, y;
+ wxCoord x = 0, y = 0, max_x = 0;
dc.SetFont(attr.GetFont());
- dc.GetTextExtent(text, &x, &y);
+ wxStringTokenizer tk(text, _T('\n'));
+ while ( tk.HasMoreTokens() )
+ {
+ dc.GetTextExtent(tk.GetNextToken(), &x, &y);
+ max_x = wxMax(max_x, x);
+ }
- return wxSize(x, y);
+ y *= 1 + text.Freq(wxT('\n')); // multiply by the number of lines.
+
+ return wxSize(max_x, y);
}
wxSize wxGridCellStringRenderer::GetBestSize(wxGrid& grid,
{
text.Printf(_T("%ld"), table->GetValueAsLong(row, col));
}
- //else: leave the string empty or put 0 into it?
+ else
+ {
+ text = table->GetValue(row, col);
+ }
return text;
}
// draw the text right aligned by default
int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign);
- hAlign = wxRIGHT;
+ hAlign = wxALIGN_RIGHT;
wxRect rect = rectCell;
rect.Inflate(-1);
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 )
{
- m_format.Printf(_T("%%%d.%d%%f"), m_width, m_precision);
+ if ( m_width == -1 )
+ {
+ // default width/precision
+ m_format = _T("%f");
+ }
+ else if ( m_precision == -1 )
+ {
+ // default precision
+ m_format.Printf(_T("%%%d.f"), m_width);
+ }
+ else
+ {
+ m_format.Printf(_T("%%%d.%df"), m_width, m_precision);
+ }
}
- text.Printf(m_format, table->GetValueAsDouble(row, col));
+ text.Printf(m_format, val);
}
- //else: leave the string empty or put 0 into it?
+ //else: text already contains the string
return text;
}
// draw the text right aligned by default
int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign);
- hAlign = wxRIGHT;
+ hAlign = wxALIGN_RIGHT;
wxRect rect = rectCell;
rect.Inflate(-1);
return DoGetBestSize(attr, dc, GetString(grid, row, col));
}
+void wxGridCellFloatRenderer::SetParameters(const wxString& params)
+{
+ bool ok = TRUE;
+
+ if ( !params )
+ {
+ // reset to defaults
+ SetWidth(-1);
+ SetPrecision(-1);
+ }
+ else
+ {
+ wxString tmp = params.BeforeFirst(_T(','));
+ if ( !!tmp )
+ {
+ long width;
+ if ( !tmp.ToLong(&width) )
+ {
+ ok = FALSE;
+ }
+ else
+ {
+ SetWidth((int)width);
+
+ tmp = params.AfterFirst(_T(','));
+ if ( !!tmp )
+ {
+ long precision;
+ if ( !tmp.ToLong(&precision) )
+ {
+ ok = FALSE;
+ }
+ else
+ {
+ SetPrecision((int)precision);
+ }
+ }
+ }
+ }
+
+ if ( !ok )
+ {
+ wxLogDebug(_T("Invalid wxGridCellFloatRenderer parameter string '%s ignored"), params.c_str());
+ }
+ }
+}
+
// ----------------------------------------------------------------------------
// wxGridCellBoolRenderer
// ----------------------------------------------------------------------------
wxSize wxGridCellBoolRenderer::ms_sizeCheckMark;
+// FIXME these checkbox size calculations are really ugly...
+
// between checkmark and box
-static const wxCoord wxGRID_CHECKMARK_MARGIN = 4;
+static const wxCoord wxGRID_CHECKMARK_MARGIN = 2;
wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid,
wxGridCellAttr& WXUNUSED(attr),
wxCoord checkSize = 0;
wxCheckBox *checkbox = new wxCheckBox(&grid, -1, wxEmptyString);
wxSize size = checkbox->GetBestSize();
- checkSize = size.y + wxGRID_CHECKMARK_MARGIN;
+ checkSize = size.y + 2*wxGRID_CHECKMARK_MARGIN;
// FIXME wxGTK::wxCheckBox::GetBestSize() gives "wrong" result
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
checkSize -= size.y / 2;
#endif
// 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;
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
- dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
- dc.DrawRectangle(rectMark);
+ // 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;
+ }
- rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
+ // 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, wxT("bool")))
+ if ( grid.GetTable()->CanGetValueAs(row, col, wxGRID_VALUE_BOOL) )
value = grid.GetTable()->GetValueAsBool(row, col);
else
- value = !!grid.GetTable()->GetValue(row, col);
+ {
+ wxString cellval( grid.GetTable()->GetValue(row, col) );
+ value = !( !cellval || (cellval == "0") );
+ }
if ( value )
{
+ wxRect rectMark = rectBorder;
+#ifdef __WXMSW__
+ // MSW DrawCheckMark() is weird (and should probably be changed...)
+ rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN/2);
+ rectMark.x++;
+ rectMark.y++;
+#else // !MSW
+ rectMark.Inflate(-wxGRID_CHECKMARK_MARGIN);
+#endif // MSW/!MSW
+
dc.SetTextForeground(attr.GetTextColour());
dc.DrawCheckMark(rectMark);
}
+
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ dc.SetPen(wxPen(attr.GetTextColour(), 1, wxSOLID));
+ dc.DrawRectangle(rectBorder);
}
// ----------------------------------------------------------------------------
// wxGridCellAttr
// ----------------------------------------------------------------------------
+wxGridCellAttr *wxGridCellAttr::Clone() const
+{
+ wxGridCellAttr *attr = new wxGridCellAttr;
+ if ( HasTextColour() )
+ attr->SetTextColour(GetTextColour());
+ if ( HasBackgroundColour() )
+ attr->SetBackgroundColour(GetBackgroundColour());
+ if ( HasFont() )
+ attr->SetFont(GetFont());
+ if ( HasAlignment() )
+ attr->SetAlignment(m_hAlign, m_vAlign);
+
+ if ( m_renderer )
+ {
+ attr->SetRenderer(m_renderer);
+ m_renderer->IncRef();
+ }
+ if ( m_editor )
+ {
+ attr->SetEditor(m_editor);
+ m_editor->IncRef();
+ }
+
+ if ( IsReadOnly() )
+ attr->SetReadOnly();
+
+ attr->SetDefAttr(m_defGridAttr);
+
+ return attr;
+}
+
const wxColour& wxGridCellAttr::GetTextColour() const
{
if (HasTextColour())
// GetRenderer and GetEditor use a slightly different decision path about
-// which to use. If a non-default attr object has one then it is used,
-// otherwise the default editor or renderer passed in is 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(wxGridCellRenderer* def) const
-{
- if ((m_defGridAttr != this || def == NULL) && HasRenderer())
- return m_renderer;
- else if (def)
- return def;
- else if (m_defGridAttr != this)
- return m_defGridAttr->GetRenderer(NULL);
- else
+// 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 NULL;
}
+
+ return renderer;
}
-wxGridCellEditor* wxGridCellAttr::GetEditor(wxGridCellEditor* def) const
+wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) const
{
- if ((m_defGridAttr != this || def == NULL) && HasEditor())
- return m_editor;
- else if (def)
- return def;
- else if (m_defGridAttr != this)
- return m_defGridAttr->GetEditor(NULL);
- else
+ wxGridCellEditor* editor = NULL;
+
+ if ( m_defGridAttr != this || grid == NULL )
+ {
+ editor = m_editor; // use local attribute
+ if ( editor )
+ editor->IncRef();
+ }
+
+ if ( !editor && grid ) // get renderer for the data type
+ editor = grid->GetDefaultEditorForCell(row, col);
+
+ if ( !editor )
+ // if we still don't have one then use the grid default
+ editor = m_defGridAttr->GetEditor(NULL,0,0);
+
+ if ( !editor )
{
wxFAIL_MSG(wxT("Missing default cell attribute"));
- return NULL;
}
+
+ return editor;
}
// ----------------------------------------------------------------------------
void wxGridRowOrColAttrData::SetAttr(wxGridCellAttr *attr, int rowOrCol)
{
- int n = m_rowsOrCols.Index(rowOrCol);
- if ( n == wxNOT_FOUND )
+ int i = m_rowsOrCols.Index(rowOrCol);
+ if ( i == wxNOT_FOUND )
{
// add the attribute
m_rowsOrCols.Add(rowOrCol);
}
else
{
+ size_t n = (size_t)i;
if ( attr )
{
// change the attribute
- m_attrs[(size_t)n] = attr;
+ m_attrs[n]->DecRef();
+ m_attrs[n] = attr;
}
else
{
// remove this attribute
- m_attrs[(size_t)n]->DecRef();
- m_rowsOrCols.RemoveAt((size_t)n);
- m_attrs.RemoveAt((size_t)n);
+ m_attrs[n]->DecRef();
+ m_rowsOrCols.RemoveAt(n);
+ m_attrs.RemoveAt(n);
}
}
}
wxGridTypeRegistry::~wxGridTypeRegistry()
{
- for (size_t i=0; i<m_typeinfo.Count(); i++)
+ size_t count = m_typeinfo.Count();
+ for ( size_t i = 0; i < count; i++ )
delete m_typeinfo[i];
}
wxGridCellRenderer* renderer,
wxGridCellEditor* editor)
{
- int loc;
wxGridDataTypeInfo* info = new wxGridDataTypeInfo(typeName, renderer, editor);
// is it already registered?
- if ((loc = FindDataType(typeName)) != -1) {
+ int loc = FindRegisteredDataType(typeName);
+ if ( loc != wxNOT_FOUND )
+ {
delete m_typeinfo[loc];
m_typeinfo[loc] = info;
}
- else {
+ else
+ {
m_typeinfo.Add(info);
}
}
-int wxGridTypeRegistry::FindDataType(const wxString& typeName)
+int wxGridTypeRegistry::FindRegisteredDataType(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;
+ size_t count = m_typeinfo.GetCount();
+ for ( size_t i = 0; i < count; i++ )
+ {
+ if ( typeName == m_typeinfo[i]->m_typeName )
+ {
+ return i;
}
}
- return found;
-}
-
-wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
-{
- wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
- return renderer;
+ return wxNOT_FOUND;
}
-wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
+int wxGridTypeRegistry::FindDataType(const wxString& typeName)
{
- wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
- return editor;
-}
-
-// ----------------------------------------------------------------------------
-// wxGridTableBase
-// ----------------------------------------------------------------------------
+ int index = FindRegisteredDataType(typeName);
+ if ( index == wxNOT_FOUND )
+ {
+ // check whether this is one of the standard ones, in which case
+ // register it "on the fly"
+ if ( typeName == wxGRID_VALUE_STRING )
+ {
+ RegisterDataType(wxGRID_VALUE_STRING,
+ new wxGridCellStringRenderer,
+ new wxGridCellTextEditor);
+ }
+ else if ( typeName == wxGRID_VALUE_BOOL )
+ {
+ RegisterDataType(wxGRID_VALUE_BOOL,
+ new wxGridCellBoolRenderer,
+ new wxGridCellBoolEditor);
+ }
+ else if ( typeName == wxGRID_VALUE_NUMBER )
+ {
+ RegisterDataType(wxGRID_VALUE_NUMBER,
+ new wxGridCellNumberRenderer,
+ new wxGridCellNumberEditor);
+ }
+ else if ( typeName == wxGRID_VALUE_FLOAT )
+ {
+ RegisterDataType(wxGRID_VALUE_FLOAT,
+ new wxGridCellFloatRenderer,
+ new wxGridCellFloatEditor);
+ }
+ else if ( typeName == wxGRID_VALUE_CHOICE )
+ {
+ RegisterDataType(wxGRID_VALUE_CHOICE,
+ new wxGridCellStringRenderer,
+ new wxGridCellChoiceEditor);
+ }
+ else
+ {
+ return wxNOT_FOUND;
+ }
+
+ // we get here only if just added the entry for this type, so return
+ // the last index
+ index = m_typeinfo.GetCount() - 1;
+ }
+
+ return index;
+}
+
+int wxGridTypeRegistry::FindOrCloneDataType(const wxString& typeName)
+{
+ int index = FindDataType(typeName);
+ if ( index == wxNOT_FOUND )
+ {
+ // the first part of the typename is the "real" type, anything after ':'
+ // are the parameters for the renderer
+ index = FindDataType(typeName.BeforeFirst(_T(':')));
+ if ( index == wxNOT_FOUND )
+ {
+ return wxNOT_FOUND;
+ }
+
+ wxGridCellRenderer *renderer = GetRenderer(index);
+ wxGridCellRenderer *rendererOld = renderer;
+ renderer = renderer->Clone();
+ rendererOld->DecRef();
+
+ wxGridCellEditor *editor = GetEditor(index);
+ wxGridCellEditor *editorOld = editor;
+ editor = editor->Clone();
+ editorOld->DecRef();
+
+ // do it even if there are no parameters to reset them to defaults
+ wxString params = typeName.AfterFirst(_T(':'));
+ renderer->SetParameters(params);
+ editor->SetParameters(params);
+
+ // register the new typename
+ RegisterDataType(typeName, renderer, editor);
+
+ // we just registered it, it's the last one
+ index = m_typeinfo.GetCount() - 1;
+ }
+
+ return index;
+}
+
+wxGridCellRenderer* wxGridTypeRegistry::GetRenderer(int index)
+{
+ wxGridCellRenderer* renderer = m_typeinfo[index]->m_renderer;
+ renderer->IncRef();
+ return renderer;
+}
+
+wxGridCellEditor* wxGridTypeRegistry::GetEditor(int index)
+{
+ wxGridCellEditor* editor = m_typeinfo[index]->m_editor;
+ editor->IncRef();
+ return editor;
+}
+
+// ----------------------------------------------------------------------------
+// wxGridTableBase
+// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
{
// as we take ownership of the pointer and don't store it, we must
// free it now
- attr->SafeDecRef();
+ wxSafeDecRef(attr);
}
}
{
// as we take ownership of the pointer and don't store it, we must
// free it now
- attr->SafeDecRef();
+ wxSafeDecRef(attr);
}
}
{
// as we take ownership of the pointer and don't store it, we must
// free it now
- attr->SafeDecRef();
- }
-}
-
-void wxGridTableBase::UpdateAttrRows( size_t pos, int numRows )
-{
- if ( m_attrProvider )
- {
- m_attrProvider->UpdateAttrRows( pos, numRows );
- }
-}
-
-void wxGridTableBase::UpdateAttrCols( size_t pos, int numCols )
-{
- if ( m_attrProvider )
- {
- m_attrProvider->UpdateAttrCols( pos, numCols );
+ wxSafeDecRef(attr);
}
}
-bool wxGridTableBase::InsertRows( size_t pos, size_t numRows )
+bool wxGridTableBase::InsertRows( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numRows) )
{
- wxFAIL_MSG( wxT("Called grid table class function InsertRows\n"
- "but your derived table class does not override this function") );
+ wxFAIL_MSG( wxT("Called grid table class function InsertRows\nbut your derived table class does not override this function") );
return FALSE;
}
-bool wxGridTableBase::AppendRows( size_t numRows )
+bool wxGridTableBase::AppendRows( size_t WXUNUSED(numRows) )
{
- wxFAIL_MSG( wxT("Called grid table class function AppendRows\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG( wxT("Called grid table class function AppendRows\nbut your derived table class does not override this function"));
return FALSE;
}
-bool wxGridTableBase::DeleteRows( size_t pos, size_t numRows )
+bool wxGridTableBase::DeleteRows( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numRows) )
{
- wxFAIL_MSG( wxT("Called grid table class function DeleteRows\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG( wxT("Called grid table class function DeleteRows\nbut your derived table class does not override this function"));
return FALSE;
}
-bool wxGridTableBase::InsertCols( size_t pos, size_t numCols )
+bool wxGridTableBase::InsertCols( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numCols) )
{
- wxFAIL_MSG( wxT("Called grid table class function InsertCols\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG( wxT("Called grid table class function InsertCols\nbut your derived table class does not override this function"));
return FALSE;
}
-bool wxGridTableBase::AppendCols( size_t numCols )
+bool wxGridTableBase::AppendCols( size_t WXUNUSED(numCols) )
{
- wxFAIL_MSG(wxT("Called grid table class function AppendCols\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG(wxT("Called grid table class function AppendCols\nbut your derived table class does not override this function"));
return FALSE;
}
-bool wxGridTableBase::DeleteCols( size_t pos, size_t numCols )
+bool wxGridTableBase::DeleteCols( size_t WXUNUSED(pos),
+ size_t WXUNUSED(numCols) )
{
- wxFAIL_MSG( wxT("Called grid table class function DeleteCols\n"
- "but your derived table class does not override this function"));
+ wxFAIL_MSG( wxT("Called grid table class function DeleteCols\nbut your derived table class does not override this function"));
return FALSE;
}
{
}
-
//////////////////////////////////////////////////////////////////////
//
// Message class for the grid table to send requests and notifications
{
}
-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();
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& value )
{
- // TODO: bounds checking
- //
+ 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;
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 )
{
{
m_data.Insert( sa, row );
}
- UpdateAttrRows( pos, numRows );
if ( GetView() )
{
wxGridTableMessage msg( this,
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 )
if ( pos >= curNumRows )
{
wxString errmsg;
- errmsg.Printf("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\n"
- "Pos value is invalid for present table with %d rows",
+ errmsg.Printf(wxT("Called wxGridStringTable::DeleteRows(pos=%d, N=%d)\nPos value is invalid for present table with %d rows"),
pos, numRows, curNumRows );
- wxFAIL_MSG( wxT(errmsg) );
+ wxFAIL_MSG( errmsg );
return FALSE;
}
m_data.Remove( pos );
}
}
- UpdateAttrRows( pos, -((int)numRows) );
if ( GetView() )
{
wxGridTableMessage msg( this,
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 )
{
m_data[row].Insert( wxEmptyString, col );
}
}
- UpdateAttrCols( pos, numCols );
if ( GetView() )
{
wxGridTableMessage msg( this,
size_t row, n;
size_t curNumRows = m_data.GetCount();
+#if 0
if ( !curNumRows )
{
// TODO: something better than this ?
//
- wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\n"
- "Call AppendRows() first") );
+ wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
return FALSE;
}
+#endif
for ( row = 0; row < curNumRows; row++ )
{
size_t row, n;
size_t curNumRows = m_data.GetCount();
- size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : 0 );
+ size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
+ ( GetView() ? GetView()->GetNumberCols() : 0 ) );
if ( pos >= curNumCols )
{
wxString errmsg;
- errmsg.Printf( "Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\n"
- "Pos value is invalid for present table with %d cols",
+ errmsg.Printf( wxT("Called wxGridStringTable::DeleteCols(pos=%d, N=%d)...\nPos value is invalid for present table with %d cols"),
pos, numCols, curNumCols );
- wxFAIL_MSG( wxT( errmsg ) );
+ wxFAIL_MSG( errmsg );
return FALSE;
}
}
}
}
- UpdateAttrCols( pos, -((int)numCols) );
if ( GetView() )
{
wxGridTableMessage msg( this,
EVT_PAINT( wxGridRowLabelWindow::OnPaint )
EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridRowLabelWindow::OnKeyDown )
+ EVT_KEY_UP( wxGridRowLabelWindow::OnKeyUp )
END_EVENT_TABLE()
wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
{
m_owner = parent;
}
-void wxGridRowLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
+void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+ if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
//////////////////////////////////////////////////////////////////////
EVT_PAINT( wxGridColLabelWindow::OnPaint )
EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridColLabelWindow::OnKeyDown )
+ EVT_KEY_UP( wxGridColLabelWindow::OnKeyUp )
END_EVENT_TABLE()
wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
{
m_owner = parent;
}
-void wxGridColLabelWindow::OnPaint( wxPaintEvent &event )
+void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
+void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+ if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
//////////////////////////////////////////////////////////////////////
EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
EVT_PAINT( wxGridCornerLabelWindow::OnPaint)
EVT_KEY_DOWN( wxGridCornerLabelWindow::OnKeyDown )
+ EVT_KEY_UP( wxGridCornerLabelWindow::OnKeyUp )
END_EVENT_TABLE()
wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
- : wxWindow( parent, id, pos, size )
+ : wxWindow( parent, id, pos, size, wxWANTS_CHARS )
{
m_owner = parent;
}
if ( !m_owner->ProcessEvent( event ) ) event.Skip();
}
+void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
+{
+ if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
+
//////////////////////////////////////////////////////////////////////
EVT_PAINT( wxGridWindow::OnPaint )
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
+ EVT_KEY_UP( wxGridWindow::OnKeyUp )
EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
END_EVENT_TABLE()
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size )
- : wxPanel( parent, id, pos, size, 0, "grid window" )
+ : wxPanel( parent, id, pos, size, wxWANTS_CHARS, "grid window" )
{
m_owner = parent;
m_rowLabelWin = rowLblWin;
#if WXGRID_DRAW_LINES
m_owner->DrawAllGridLines( dc, reg );
#endif
+ m_owner->DrawGridSpace( dc );
m_owner->DrawHighlight( dc );
}
}
-// 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();
}
-// We are trapping erase background events to reduce flicker under MSW
-// and GTK but this can leave junk in the space beyond the last row and
-// col. So here we paint these spaces if they are visible.
-//
-void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
+void wxGridWindow::OnKeyUp( wxKeyEvent& event )
{
- int cw, ch;
- GetClientSize( &cw, &ch );
-
- int right, bottom;
- m_owner->CalcUnscrolledPosition( cw, ch, &right, &bottom );
-
- wxRect rightRect;
- rightRect = m_owner->CellToRect( 0, m_owner->GetNumberCols()-1 );
-
- wxRect bottomRect;
- bottomRect = m_owner->CellToRect( m_owner->GetNumberRows()-1, 0 );
-
- if ( right > rightRect.GetRight() || bottom > bottomRect.GetBottom() )
- {
- int left, top;
- m_owner->CalcUnscrolledPosition( 0, 0, &left, &top );
-
- wxClientDC dc( this );
- m_owner->PrepareDC( dc );
- dc.SetBrush( wxBrush(m_owner->GetDefaultCellBackgroundColour(), wxSOLID) );
- dc.SetPen( *wxTRANSPARENT_PEN );
-
- if ( right > rightRect.GetRight() )
- dc.DrawRectangle( rightRect.GetRight()+1, top, right - rightRect.GetRight(), ch );
+ if ( !m_owner->ProcessEvent( event ) ) event.Skip();
+}
- if ( bottom > bottomRect.GetBottom() )
- dc.DrawRectangle( left, bottomRect.GetBottom()+1, cw, bottom - bottomRect.GetBottom() );
- }
+void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
+{
}
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()
const wxSize& size,
long style,
const wxString& name )
- : wxScrolledWindow( parent, id, pos, size, style, name ),
- m_colMinWidths(wxKEY_INTEGER, GRID_HASH_SIZE)
+ : wxScrolledWindow( parent, id, pos, size, (style | wxWANTS_CHARS), name ),
+ m_colMinWidths(GRID_HASH_SIZE),
+ m_rowMinHeights(GRID_HASH_SIZE)
{
Create();
}
wxGrid::~wxGrid()
{
ClearAttrCache();
- m_defaultCellAttr->SafeDecRef();
+ wxSafeDecRef(m_defaultCellAttr);
#ifdef DEBUG_ATTR_CACHE
size_t total = gs_nAttrCacheHits + gs_nAttrCacheMisses;
delete m_table;
delete m_typeRegistry;
+ delete m_selection;
}
void wxGrid::Create()
{
m_created = FALSE; // set to TRUE by CreateGrid
- m_displayed = TRUE; // FALSE; // set to TRUE by OnPaint
m_table = (wxGridTableBase *) NULL;
m_ownTable = FALSE;
// Set default cell attributes
m_defaultCellAttr->SetFont(GetFont());
- m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
+ m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);
m_defaultCellAttr->SetTextColour(
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
m_defaultCellAttr->SetBackgroundColour(
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?
+ // create the type registry
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);
-
+ m_selection = 0;
// subwindow components that make up the wxGrid
m_cornerLabelWin = new wxGridCornerLabelWindow( this,
-1,
}
-bool wxGrid::CreateGrid( int numRows, int numCols )
+bool wxGrid::CreateGrid( int numRows, int numCols,
+ wxGrid::wxGridSelectionModes selmode )
{
- if ( m_created )
- {
- wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
- return FALSE;
- }
- else
- {
- m_numRows = numRows;
- m_numCols = numCols;
+ wxCHECK_MSG( !m_created,
+ FALSE,
+ wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
- m_table = new wxGridStringTable( m_numRows, m_numCols );
- m_table->SetView( this );
- m_ownTable = TRUE;
- Init();
- m_created = TRUE;
- }
+ m_numRows = numRows;
+ m_numCols = numCols;
+
+ m_table = new wxGridStringTable( m_numRows, m_numCols );
+ m_table->SetView( this );
+ m_ownTable = TRUE;
+ m_selection = new wxGridSelection( this, selmode );
+ Init();
+ m_created = TRUE;
return m_created;
}
-bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership )
+void wxGrid::SetSelectionMode(wxGrid::wxGridSelectionModes selmode)
+{
+ if ( !m_created )
+ {
+ wxFAIL_MSG( wxT("Called wxGrid::SetSelectionMode() before calling CreateGrid()") );
+ }
+ else
+ m_selection->SetSelectionMode( selmode );
+}
+
+bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
+ wxGrid::wxGridSelectionModes selmode )
{
if ( m_created )
{
// 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;
}
m_table->SetView( this );
if (takeOwnership)
m_ownTable = TRUE;
+ m_selection = new wxGridSelection( this, selmode );
Init();
m_created = TRUE;
}
void wxGrid::Init()
{
- 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;
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();
m_gridLineColour = wxColour( 128, 128, 255 );
m_gridLinesEnabled = TRUE;
+ m_cellHighlightColour = m_gridLineColour;
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_winCapture = (wxWindow *)NULL;
m_canDragRowSize = TRUE;
m_canDragColSize = TRUE;
+ m_canDragGridSize = TRUE;
m_dragLastPos = -1;
m_dragRowOrCol = -1;
m_isDragging = FALSE;
m_currentCellCoords = wxGridNoCellCoords;
- m_selectedTopLeft = wxGridNoCellCoords;
- m_selectedBottomRight = wxGridNoCellCoords;
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
m_inOnKeyDown = FALSE;
m_batchCount = 0;
+
+ m_extraWidth =
+ m_extraHeight = 50;
+
+ CalcDimensions();
}
// ----------------------------------------------------------------------------
int cw, ch;
GetClientSize( &cw, &ch );
- if ( m_numRows > 0 && m_numCols > 0 )
+ if ( m_numRows > 0 || m_numCols > 0 )
{
- int right = GetColRight( m_numCols-1 ) + 50;
- int bottom = GetRowBottom( m_numRows-1 ) + 50;
+ int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0;
+ int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0;
// TODO: restore the scroll position that we had before sizing
//
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() )
{
InitRowHeights();
}
+#endif
switch ( msg.GetId() )
{
{
size_t pos = msg.GetCommandInt();
int numRows = msg.GetCommandInt2();
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Insert( m_defaultRowHeight, pos );
- m_rowBottoms.Insert( 0, pos );
- }
+
m_numRows += numRows;
- int bottom = 0;
- if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+ if ( !m_rowHeights.IsEmpty() )
+ {
+ for ( i = 0; i < numRows; i++ )
+ {
+ m_rowHeights.Insert( m_defaultRowHeight, pos );
+ m_rowBottoms.Insert( 0, pos );
+ }
+
+ int bottom = 0;
+ if ( pos > 0 ) bottom = m_rowBottoms[pos-1];
+
+ for ( i = pos; i < m_numRows; i++ )
+ {
+ bottom += m_rowHeights[i];
+ m_rowBottoms[i] = bottom;
+ }
+ }
+ if ( m_currentCellCoords == wxGridNoCellCoords )
+ {
+ // if we have just inserted cols into an empty grid the current
+ // cell will be undefined...
+ //
+ SetCurrentCell( 0, 0 );
+ }
+ m_selection->UpdateRows( pos, numRows );
+ wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+ if (attrProvider)
+ attrProvider->UpdateAttrRows( pos, numRows );
- for ( i = pos; i < m_numRows; i++ )
+ if ( !GetBatchCount() )
{
- bottom += m_rowHeights[i];
- m_rowBottoms[i] = bottom;
+ CalcDimensions();
+ m_rowLabelWin->Refresh();
}
- CalcDimensions();
}
- return TRUE;
+ result = TRUE;
+ break;
case wxGRIDTABLE_NOTIFY_ROWS_APPENDED:
{
int numRows = msg.GetCommandInt();
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Add( m_defaultRowHeight );
- m_rowBottoms.Add( 0 );
- }
-
int oldNumRows = m_numRows;
m_numRows += numRows;
- int bottom = 0;
- if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
+ if ( !m_rowHeights.IsEmpty() )
+ {
+ for ( i = 0; i < numRows; i++ )
+ {
+ m_rowHeights.Add( m_defaultRowHeight );
+ m_rowBottoms.Add( 0 );
+ }
+
+ int bottom = 0;
+ if ( oldNumRows > 0 ) bottom = m_rowBottoms[oldNumRows-1];
- for ( i = oldNumRows; i < m_numRows; i++ )
+ for ( i = oldNumRows; i < m_numRows; i++ )
+ {
+ bottom += m_rowHeights[i];
+ m_rowBottoms[i] = bottom;
+ }
+ }
+ if ( m_currentCellCoords == wxGridNoCellCoords )
+ {
+ // if we have just inserted cols into an empty grid the current
+ // cell will be undefined...
+ //
+ SetCurrentCell( 0, 0 );
+ }
+ if ( !GetBatchCount() )
{
- bottom += m_rowHeights[i];
- m_rowBottoms[i] = bottom;
+ CalcDimensions();
+ m_rowLabelWin->Refresh();
}
- CalcDimensions();
}
- return TRUE;
+ result = TRUE;
+ break;
case wxGRIDTABLE_NOTIFY_ROWS_DELETED:
{
size_t pos = msg.GetCommandInt();
int numRows = msg.GetCommandInt2();
- for ( i = 0; i < numRows; i++ )
- {
- m_rowHeights.Remove( pos );
- m_rowBottoms.Remove( pos );
- }
m_numRows -= numRows;
- if ( !m_numRows )
- {
- m_numCols = 0;
- m_colWidths.Clear();
- m_colRights.Clear();
- m_currentCellCoords = wxGridNoCellCoords;
- }
- else
+ if ( !m_rowHeights.IsEmpty() )
{
- if ( m_currentCellCoords.GetRow() >= m_numRows )
- m_currentCellCoords.Set( 0, 0 );
+ for ( i = 0; i < numRows; i++ )
+ {
+ m_rowHeights.Remove( pos );
+ m_rowBottoms.Remove( pos );
+ }
int h = 0;
for ( i = 0; i < m_numRows; i++ )
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 )
+ {
+ // if we have just inserted cols into an empty grid the current
+ // cell will be undefined...
+ //
+ SetCurrentCell( 0, 0 );
+ }
+ m_selection->UpdateCols( pos, numCols );
+ wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+ if (attrProvider)
+ attrProvider->UpdateAttrCols( pos, numCols );
+ if ( !GetBatchCount() )
{
- right += m_colWidths[i];
- m_colRights[i] = right;
+ CalcDimensions();
+ m_colLabelWin->Refresh();
}
- CalcDimensions();
+
}
- return TRUE;
+ result = TRUE;
+ break;
case wxGRIDTABLE_NOTIFY_COLS_APPENDED:
{
int numCols = msg.GetCommandInt();
- for ( i = 0; i < numCols; i++ )
- {
- m_colWidths.Add( m_defaultColWidth );
- m_colRights.Add( 0 );
- }
-
int oldNumCols = m_numCols;
m_numCols += numCols;
+ if ( !m_colWidths.IsEmpty() )
+ {
+ for ( i = 0; i < numCols; i++ )
+ {
+ m_colWidths.Add( m_defaultColWidth );
+ m_colRights.Add( 0 );
+ }
- int right = 0;
- if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
+ int right = 0;
+ if ( oldNumCols > 0 ) right = m_colRights[oldNumCols-1];
- for ( i = oldNumCols; i < m_numCols; i++ )
+ for ( i = oldNumCols; i < m_numCols; i++ )
+ {
+ right += m_colWidths[i];
+ m_colRights[i] = right;
+ }
+ }
+ if ( m_currentCellCoords == wxGridNoCellCoords )
{
- 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++ )
m_colRights[i] = w;
}
}
- CalcDimensions();
+ if ( !m_numCols )
+ {
+ m_currentCellCoords = wxGridNoCellCoords;
+ }
+ else
+ {
+ if ( m_currentCellCoords.GetCol() >= m_numCols )
+ m_currentCellCoords.Set( 0, 0 );
+ }
+ m_selection->UpdateCols( pos, -((int)numCols) );
+ wxGridCellAttrProvider * attrProvider = m_table->GetAttrProvider();
+ if (attrProvider) {
+ attrProvider->UpdateAttrCols( pos, -((int)numCols) );
+// ifdef'd out following patch from Paul Gammans
+#if 0
+ // No need to touch row attributes, unless we
+ // removed _all_ columns, in this case, we remove
+ // all row attributes.
+ // I hate to do this here, but the
+ // needed data is not available inside UpdateAttrCols.
+ if ( !GetNumberCols() )
+ attrProvider->UpdateAttrRows( 0, -GetNumberRows() );
+#endif
+ }
+ if ( !GetBatchCount() )
+ {
+ CalcDimensions();
+ m_colLabelWin->Refresh();
+ }
+ return TRUE;
}
- return TRUE;
+#if 0
+// There is no path to this code !!!!!!
+ result = TRUE;
+ break;
+#endif
}
- return FALSE;
+ if (result && !GetBatchCount() )
+ m_gridWin->Refresh();
+ return result;
}
-void wxGrid::CalcRowLabelsExposed( wxRegion& reg )
+void wxGrid::CalcRowLabelsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
}
-void wxGrid::CalcColLabelsExposed( wxRegion& reg )
+void wxGrid::CalcColLabelsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
}
-void wxGrid::CalcCellsExposed( wxRegion& reg )
+void wxGrid::CalcCellsExposed( const wxRegion& reg )
{
wxRegionIterator iter( reg );
wxRect r;
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- y = wxMax( y, GetRowTop(m_dragRowOrCol) + WXGRID_MIN_ROW_HEIGHT );
+ y = wxMax( y,
+ GetRowTop(m_dragRowOrCol) +
+ GetRowMinimalHeight(m_dragRowOrCol) );
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
break;
case WXGRID_CURSOR_SELECT_ROW:
- if ( (row = YToRow( y )) >= 0 &&
- !IsInSelection( row, 0 ) )
+ if ( (row = YToRow( y )) >= 0 )
{
- SelectRow( row, TRUE );
+ m_selection->SelectRow( row,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
// default label to suppress warnings about "enumeration value
if ( row >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, row, -1, event ) )
{
- SelectRow( row, event.ShiftDown() );
+ if ( !event.ShiftDown() && !event.ControlDown() )
+ ClearSelection();
+ if ( event.ShiftDown() )
+ m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+ 0,
+ row,
+ GetNumberCols() - 1,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ else
+ m_selection->SelectRow( row,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
ChangeCursorMode(WXGRID_CURSOR_SELECT_ROW, m_rowLabelWin);
}
}
break;
case WXGRID_CURSOR_SELECT_COL:
- if ( (col = XToCol( x )) >= 0 &&
- !IsInSelection( 0, col ) )
+ if ( (col = XToCol( x )) >= 0 )
{
- SelectCol( col, TRUE );
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
// default label to suppress warnings about "enumeration value
if ( col >= 0 &&
!SendEvent( wxEVT_GRID_LABEL_LEFT_CLICK, -1, col, event ) )
{
- SelectCol( col, event.ShiftDown() );
+ if ( !event.ShiftDown() && !event.ControlDown() )
+ ClearSelection();
+ if ( event.ShiftDown() )
+ m_selection->SelectBlock( 0,
+ m_currentCellCoords.GetCol(),
+ GetNumberRows() - 1, col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ else
+ m_selection->SelectCol( col,
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
ChangeCursorMode(WXGRID_CURSOR_SELECT_COL, m_colLabelWin);
}
}
{
// Hide the edit control, so it
// won't interfer with drag-shrinking.
- if ( IsCellEditControlEnabled() )
+ if ( IsCellEditControlShown() )
+ {
HideCellEditControl();
+ SaveEditControlValue();
+ }
// Have we captured the mouse yet?
if (! m_winCapture)
if ( coords != wxGridNoCellCoords )
{
- if ( !IsSelection() )
+ if ( event.ControlDown() )
{
- SelectBlock( coords, coords );
+ if ( m_selectingKeyboard == wxGridNoCellCoords)
+ m_selectingKeyboard = coords;
+ HighlightBlock ( m_selectingKeyboard, coords );
}
else
{
- SelectBlock( m_currentCellCoords, coords );
+ if ( !IsSelection() )
+ {
+ HighlightBlock( coords, coords );
+ }
+ else
+ {
+ HighlightBlock( m_currentCellCoords, coords );
+ }
}
if (! IsVisible(coords))
{
MakeCellVisible(coords);
// TODO: need to introduce a delay or something here. The
- // scrolling is way to fast, at least on MSW.
+ // scrolling is way to fast, at least on MSW - also on GTK.
}
}
}
wxClientDC dc( m_gridWin );
PrepareDC( dc );
- y = wxMax( y, GetRowTop(m_dragRowOrCol) + WXGRID_MIN_ROW_HEIGHT );
+ y = wxMax( y, GetRowTop(m_dragRowOrCol) +
+ GetRowMinimalHeight(m_dragRowOrCol) );
dc.SetLogicalFunction(wxINVERT);
if ( m_dragLastPos >= 0 )
{
m_isDragging = FALSE;
m_startDragPos = wxDefaultPosition;
-
- if ( coords != wxGridNoCellCoords )
- {
- // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
- // immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
- // wxGTK
+ // VZ: if we do this, the mode is reset to WXGRID_CURSOR_SELECT_CELL
+ // immediately after it becomes WXGRID_CURSOR_RESIZE_ROW/COL under
+ // wxGTK
#if 0
- if ( event.Entering() || event.Leaving() )
- {
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
- }
- else
+ if ( event.Entering() || event.Leaving() )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ m_gridWin->SetCursor( *wxSTANDARD_CURSOR );
+ }
+ else
#endif // 0
- // ------------ Left button pressed
- //
- if ( event.LeftDown() )
+ // ------------ Left button pressed
+ //
+ if ( event.LeftDown() && coords != wxGridNoCellCoords )
+ {
+ if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
{
- DisableCellEditControl();
+ if ( !event.ControlDown() )
+ ClearSelection();
if ( event.ShiftDown() )
{
- SelectBlock( m_currentCellCoords, coords );
+ m_selection->SelectBlock( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol(),
+ coords.GetRow(),
+ coords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
}
else if ( XToEdgeOfCol(x) < 0 &&
YToEdgeOfRow(y) < 0 )
{
- if ( !SendEvent( wxEVT_GRID_CELL_LEFT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
+ DisableCellEditControl();
+ MakeCellVisible( coords );
+
+ // if this is the second click on this cell then start
+ // the edit control
+ if ( m_waitForSlowClick &&
+ (coords == m_currentCellCoords) &&
+ CanEnableCellControl())
{
- MakeCellVisible( coords );
-
- // if this is the second click on this cell then start
- // the edit control
- if ( m_waitForSlowClick &&
- (coords == m_currentCellCoords) &&
- CanEnableCellControl())
- {
- EnableCellEditControl();
+ EnableCellEditControl();
- wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
- attr->GetEditor(GetDefaultEditorForCell(coords.GetRow(), coords.GetCol()))->StartingClick();
- attr->DecRef();
+ wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+ wxGridCellEditor *editor = attr->GetEditor(this,
+ coords.GetRow(),
+ coords.GetCol());
+ editor->StartingClick();
+ editor->DecRef();
+ attr->DecRef();
- m_waitForSlowClick = FALSE;
+ 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 );
- m_waitForSlowClick = TRUE;
+ if ( m_selection->GetSelectionMode()
+ != wxGrid::wxGridSelectCells)
+ HighlightBlock( coords, coords );
}
+ m_waitForSlowClick = TRUE;
}
}
}
+ }
- // ------------ Left double click
- //
- else if ( event.LeftDClick() )
+ // ------------ Left double click
+ //
+ else if ( event.LeftDClick() && coords != wxGridNoCellCoords )
+ {
+ DisableCellEditControl();
+
+ if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
{
- DisableCellEditControl();
- if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
- {
- SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event );
- }
+ SendEvent( wxEVT_GRID_CELL_LEFT_DCLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event );
}
+ }
- // ------------ Left button released
- //
- else if ( event.LeftUp() )
+ // ------------ Left button released
+ //
+ else if ( event.LeftUp() )
+ {
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
+ if ( m_selectingTopLeft != wxGridNoCellCoords &&
+ m_selectingBottomRight != wxGridNoCellCoords )
{
- if ( IsSelection() )
+ if (m_winCapture)
{
- if (m_winCapture)
- {
- m_winCapture->ReleaseMouse();
- m_winCapture = NULL;
- }
- SendEvent( wxEVT_GRID_RANGE_SELECT, -1, -1, event );
+ m_winCapture->ReleaseMouse();
+ m_winCapture = NULL;
}
-
- // Show the edit control, if it has been hidden for
- // drag-shrinking.
- ShowCellEditControl();
+ m_selection->SelectBlock( m_selectingTopLeft.GetRow(),
+ m_selectingTopLeft.GetCol(),
+ m_selectingBottomRight.GetRow(),
+ m_selectingBottomRight.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
}
- else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
- {
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- DoEndDragResizeRow();
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
- }
- else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
- {
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- DoEndDragResizeCol();
+ // Show the edit control, if it has been hidden for
+ // drag-shrinking.
+ ShowCellEditControl();
+ }
+ else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ DoEndDragResizeRow();
- // Note: we are ending the event *after* doing
- // default processing in this case
- //
- SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
- }
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event );
+ }
+ else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_COL )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ DoEndDragResizeCol();
- m_dragLastPos = -1;
+ // Note: we are ending the event *after* doing
+ // default processing in this case
+ //
+ SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
}
+ m_dragLastPos = -1;
+ }
+
- // ------------ Right button down
- //
- else if ( event.RightDown() )
+ // ------------ Right button down
+ //
+ else if ( event.RightDown() && coords != wxGridNoCellCoords )
+ {
+ DisableCellEditControl();
+ if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
{
- DisableCellEditControl();
- if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_CLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
- {
- // no default action at the moment
- }
+ // no default action at the moment
}
+ }
- // ------------ Right double click
- //
- else if ( event.RightDClick() )
+ // ------------ Right double click
+ //
+ else if ( event.RightDClick() && coords != wxGridNoCellCoords )
+ {
+ DisableCellEditControl();
+ if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
+ coords.GetRow(),
+ coords.GetCol(),
+ event ) )
{
- DisableCellEditControl();
- if ( !SendEvent( wxEVT_GRID_CELL_RIGHT_DCLICK,
- coords.GetRow(),
- coords.GetCol(),
- event ) )
- {
- // no default action at the moment
- }
+ // no default action at the moment
}
+ }
+
+ // ------------ Moving and no button action
+ //
+ else if ( event.Moving() && !event.IsButton() )
+ {
+ int dragRow = YToEdgeOfRow( y );
+ int dragCol = XToEdgeOfCol( x );
- // ------------ Moving and no button action
+ // Dragging on the corner of a cell to resize in both
+ // directions is not implemented yet...
//
- else if ( event.Moving() && !event.IsButton() )
+ if ( dragRow >= 0 && dragCol >= 0 )
{
- int dragRow = YToEdgeOfRow( y );
- int dragCol = XToEdgeOfCol( x );
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ return;
+ }
- // Dragging on the corner of a cell to resize in both
- // directions is not implemented yet...
- //
- if ( dragRow >= 0 && dragCol >= 0 )
- {
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
- return;
- }
+ if ( dragRow >= 0 )
+ {
+ m_dragRowOrCol = dragRow;
- if ( dragRow >= 0 )
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- m_dragRowOrCol = dragRow;
-
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
- {
- if ( CanDragRowSize() )
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
- }
-
- return;
+ if ( CanDragRowSize() && CanDragGridSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
}
if ( dragCol >= 0 )
{
m_dragRowOrCol = dragCol;
+ }
- if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
- {
- if ( CanDragColSize() )
- ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
- }
+ return;
+ }
- return;
- }
+ if ( dragCol >= 0 )
+ {
+ m_dragRowOrCol = dragCol;
- // Neither on a row or col edge
- //
- if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+ if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
- ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
+ if ( CanDragColSize() && CanDragGridSize() )
+ ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
}
+
+ return;
+ }
+
+ // Neither on a row or col edge
+ //
+ if ( m_cursorMode != WXGRID_CURSOR_SELECT_CELL )
+ {
+ ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL);
}
}
}
dc.SetLogicalFunction( wxINVERT );
dc.DrawLine( left, m_dragLastPos, left+cw, m_dragLastPos );
HideCellEditControl();
+ SaveEditControlValue();
int rowTop = GetRowTop(m_dragRowOrCol);
SetRowSize( m_dragRowOrCol,
dc.SetLogicalFunction( wxINVERT );
dc.DrawLine( m_dragLastPos, top, m_dragLastPos, top+ch );
HideCellEditControl();
+ SaveEditControlValue();
int colLeft = GetColLeft(m_dragRowOrCol);
SetColSize( m_dragRowOrCol,
{
if ( m_table )
{
+ if (IsCellEditControlEnabled())
+ DisableCellEditControl();
+
m_table->Clear();
- SetEditControlValue();
if ( !GetBatchCount() ) m_gridWin->Refresh();
}
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- bool ok = m_table->InsertRows( pos, numRows );
+ 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;
}
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
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- if (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
- //
- ClearSelection();
- if ( !GetBatchCount() ) Refresh();
- return TRUE;
- }
+ 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;
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- bool ok = m_table->InsertCols( pos, numCols );
-
+ 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;
}
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
}
if (IsCellEditControlEnabled())
DisableCellEditControl();
- if ( 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
- //
- ClearSelection();
- if ( !GetBatchCount() ) Refresh();
- return TRUE;
- }
+ 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
}
return FALSE;
}
type,
this,
rowOrCol,
- mouseEv.GetX(), mouseEv.GetY(),
+ mouseEv.GetX() + GetColLabelSize(),
+ mouseEv.GetY() + GetRowLabelSize(),
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
}
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(),
type,
this,
row, col,
- mouseEv.GetX(), mouseEv.GetY(),
+ mouseEv.GetX() + GetColLabelSize(),
+ mouseEv.GetY() + GetRowLabelSize(),
+ FALSE,
mouseEv.ControlDown(),
mouseEv.ShiftDown(),
mouseEv.AltDown(),
void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
- wxPaintDC dc( this );
-
- if ( m_currentCellCoords == wxGridNoCellCoords &&
- m_numRows && m_numCols )
- {
- m_currentCellCoords.Set(0, 0);
- SetEditControlValue();
- ShowCellEditControl();
- }
-
- m_displayed = TRUE;
+ wxPaintDC dc(this); // needed to prevent zillions of paint events on MSW
}
// 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();
if ( !parent->GetEventHandler()->ProcessEvent( keyEvt ) )
{
- // TODO: Should also support Shift-cursor keys for
- // extending the selection. Maybe add a flag to
- // MoveCursorXXX() and MoveCursorXXXBlock() and
- // just send event.ShiftDown().
-
// try local handlers
//
switch ( event.KeyCode() )
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;
}
else
{
- MoveCursorDown();
+ if ( GetGridCursorRow() < GetNumberRows()-1 )
+ {
+ MoveCursorDown( event.ShiftDown() );
+ }
+ else
+ {
+ // at the bottom of a column
+ HideCellEditControl();
+ SaveEditControlValue();
+ }
}
break;
+ case WXK_ESCAPE:
+ ClearSelection();
+ break;
+
case WXK_TAB:
if (event.ShiftDown())
- MoveCursorLeft();
+ {
+ if ( GetGridCursorCol() > 0 )
+ {
+ MoveCursorLeft( FALSE );
+ }
+ else
+ {
+ // at left of grid
+ HideCellEditControl();
+ SaveEditControlValue();
+ }
+ }
else
- MoveCursorRight();
+ {
+ if ( GetGridCursorCol() < GetNumberCols()-1 )
+ {
+ MoveCursorRight( FALSE );
+ }
+ else
+ {
+ // at right of grid
+ HideCellEditControl();
+ SaveEditControlValue();
+ }
+ }
break;
case WXK_HOME:
MovePageDown();
break;
- // We don't want these keys to trigger the edit control, any others?
- case WXK_SHIFT:
- case WXK_ALT:
- case WXK_CONTROL:
- case WXK_CAPITAL:
- event.Skip();
- break;
-
case WXK_SPACE:
+ if ( event.ControlDown() )
+ {
+ m_selection->ToggleCellSelection( m_currentCellCoords.GetRow(),
+ m_currentCellCoords.GetCol(),
+ event.ControlDown(),
+ event.ShiftDown(),
+ event.AltDown(),
+ event.MetaDown() );
+ break;
+ }
if ( !IsEditable() )
{
- MoveCursorRight();
+ MoveCursorRight( FALSE );
break;
}
// Otherwise fall through to default
default:
- // now try the cell edit control
- //
+ // is it possible to edit the current cell at all?
if ( !IsCellEditControlEnabled() && CanEnableCellControl() )
{
- EnableCellEditControl();
+ // 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);
- attr->GetEditor(GetDefaultEditorForCell(row, col))->StartingKey(event);
+ wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+
+ // <F2> is special and will always start editing, for
+ // other keys - ask the editor itself
+ if ( (event.KeyCode() == WXK_F2 && !event.HasModifiers())
+ || editor->IsAcceptedKey(event) )
+ {
+ EnableCellEditControl();
+ editor->StartingKey(event);
+ }
+ else
+ {
+ event.Skip();
+ }
+
+ editor->DecRef();
attr->DecRef();
}
else
{
- // let others process char events for readonly cells
+ // let others process char events with modifiers or all
+ // char events for readonly cells
event.Skip();
}
break;
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&)
{
return;
}
- if ( m_displayed &&
- m_currentCellCoords != wxGridNoCellCoords )
+ wxClientDC dc(m_gridWin);
+ PrepareDC(dc);
+
+ if ( m_currentCellCoords != wxGridNoCellCoords )
{
HideCellEditControl();
- SaveEditControlValue();
DisableCellEditControl();
- // Clear the old current cell highlight
- wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+ if ( IsVisible( m_currentCellCoords, FALSE ) )
+ {
+ wxRect r;
+ r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+ if ( !m_gridLinesEnabled )
+ {
+ r.x--;
+ r.y--;
+ r.width++;
+ r.height++;
+ }
- // Otherwise refresh redraws the highlight!
- m_currentCellCoords = coords;
+ CalcCellsExposed( r );
+
+ // Otherwise refresh redraws the highlight!
+ m_currentCellCoords = coords;
- m_gridWin->Refresh( FALSE, &r );
+ DrawGridCellArea(dc);
+ DrawAllGridLines( dc, r );
+ }
}
m_currentCellCoords = coords;
- SetEditControlValue();
+ wxGridCellAttr* attr = GetCellAttr(coords);
+ DrawCellHighlight(dc, attr);
+ attr->DecRef();
+}
+
+
+void wxGrid::HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+{
+ int temp;
+ wxGridCellCoords updateTopLeft, updateBottomRight;
+
+ if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
+ {
+ leftCol = 0;
+ rightCol = GetNumberCols() - 1;
+ }
+ else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
+ {
+ topRow = 0;
+ bottomRow = GetNumberRows() - 1;
+ }
+ if ( topRow > bottomRow )
+ {
+ temp = topRow;
+ topRow = bottomRow;
+ bottomRow = temp;
+ }
- if ( m_displayed )
+ if ( leftCol > rightCol )
{
- wxClientDC dc(m_gridWin);
- PrepareDC(dc);
+ temp = leftCol;
+ leftCol = rightCol;
+ rightCol = temp;
+ }
- wxGridCellAttr* attr = GetCellAttr(coords);
- DrawCellHighlight(dc, attr);
- attr->DecRef();
+ updateTopLeft = wxGridCellCoords( topRow, leftCol );
+ updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+
+ if ( m_selectingTopLeft != updateTopLeft ||
+ m_selectingBottomRight != updateBottomRight )
+ {
+ // Compute two optimal update rectangles:
+ // Either one rectangle is a real subset of the
+ // other, or they are (almost) disjoint!
+ wxRect rect[4];
+ bool need_refresh[4];
+ need_refresh[0] =
+ need_refresh[1] =
+ need_refresh[2] =
+ need_refresh[3] = FALSE;
+ int i;
+
+ // Store intermediate values
+ wxCoord oldLeft = m_selectingTopLeft.GetCol();
+ wxCoord oldTop = m_selectingTopLeft.GetRow();
+ wxCoord oldRight = m_selectingBottomRight.GetCol();
+ wxCoord oldBottom = m_selectingBottomRight.GetRow();
- if ( IsSelection() )
+ // Determine the outer/inner coordinates.
+ if (oldLeft > leftCol)
{
- wxRect r( SelectionToDeviceRect() );
- ClearSelection();
- if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
+ temp = oldLeft;
+ oldLeft = leftCol;
+ leftCol = temp;
+ }
+ if (oldTop > topRow )
+ {
+ temp = oldTop;
+ oldTop = topRow;
+ topRow = temp;
+ }
+ if (oldRight < rightCol )
+ {
+ temp = oldRight;
+ oldRight = rightCol;
+ rightCol = temp;
+ }
+ if (oldBottom < bottomRow)
+ {
+ temp = oldBottom;
+ oldBottom = bottomRow;
+ bottomRow = temp;
+ }
+
+ // Now, either the stuff marked old is the outer
+ // rectangle or we don't have a situation where one
+ // is contained in the other.
+
+ if ( oldLeft < leftCol )
+ {
+ need_refresh[0] = TRUE;
+ rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ oldLeft ),
+ wxGridCellCoords ( oldBottom,
+ leftCol - 1 ) );
+ }
+
+ if ( oldTop < topRow )
+ {
+ need_refresh[1] = TRUE;
+ rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ leftCol ),
+ wxGridCellCoords ( topRow - 1,
+ rightCol ) );
+ }
+
+ if ( oldRight > rightCol )
+ {
+ need_refresh[2] = TRUE;
+ rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
+ rightCol + 1 ),
+ wxGridCellCoords ( oldBottom,
+ oldRight ) );
+ }
+
+ if ( oldBottom > bottomRow )
+ {
+ need_refresh[3] = TRUE;
+ rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
+ leftCol ),
+ wxGridCellCoords ( oldBottom,
+ rightCol ) );
}
+
+
+ // Change Selection
+ m_selectingTopLeft = updateTopLeft;
+ m_selectingBottomRight = updateBottomRight;
+
+ // various Refresh() calls
+ for (i = 0; i < 4; i++ )
+ if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
+ m_gridWin->Refresh( FALSE, &(rect[i]) );
}
+
+ // never generate an event as it will be generated from
+ // wxGridSelection::SelectBlock!
+ // (old comment from when this was the body of SelectBlock)
}
}
+void wxGrid::DrawGridSpace( wxDC& dc )
+{
+ int cw, ch;
+ m_gridWin->GetClientSize( &cw, &ch );
+
+ int right, bottom;
+ CalcUnscrolledPosition( cw, ch, &right, &bottom );
+
+ int rightCol = m_numCols > 0 ? GetColRight(m_numCols - 1) : 0;
+ int bottomRow = m_numRows > 0 ? GetRowBottom(m_numRows - 1) : 0 ;
+
+ if ( right > rightCol || bottom > bottomRow )
+ {
+ int left, top;
+ CalcUnscrolledPosition( 0, 0, &left, &top );
+
+ dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
+ dc.SetPen( *wxTRANSPARENT_PEN );
+
+ if ( right > rightCol )
+ {
+ dc.DrawRectangle( rightCol, top, right - rightCol, ch);
+ }
+
+ if ( bottom > bottomRow )
+ {
+ dc.DrawRectangle( left, bottomRow, cw, bottom - bottomRow);
+ }
+ }
+}
+
+
void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
{
int row = coords.GetRow();
bool isCurrent = coords == m_currentCellCoords;
- wxRect rect;
- rect.x = GetColLeft(col);
- rect.y = GetRowTop(row);
- rect.width = GetColWidth(col) - 1;
- rect.height = GetRowHeight(row) - 1;
+ wxRect rect = CellToRect( row, col );
// if the editor is shown, we should use it and not the renderer
- if ( isCurrent && IsCellEditControlEnabled() )
+ // Note: However, only if it is really _shown_, i.e. not hidden!
+ if ( isCurrent && IsCellEditControlShown() )
{
- attr->GetEditor(GetDefaultEditorForCell(row, col))->
- PaintBackground(rect, attr);
+ wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+ editor->PaintBackground(rect, attr);
+ editor->DecRef();
}
else
{
// but all the rest is drawn by the cell renderer and hence may be
// customized
- attr->GetRenderer(GetDefaultRendererForCell(row,col))->
- Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
-
+ wxGridCellRenderer *renderer = attr->GetRenderer(this, row, col);
+ renderer->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
+ renderer->DecRef();
}
attr->DecRef();
if ( GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
return;
- wxRect rect;
- rect.x = GetColLeft(col);
- rect.y = GetRowTop(row);
- rect.width = GetColWidth(col) - 1;
- rect.height = GetRowHeight(row) - 1;
+ wxRect rect = CellToRect(row, col);
// hmmm... what could we do here to show that the cell is disabled?
// for now, I just draw a thinner border than for the other ones, but
// it doesn't look really good
- dc.SetPen(wxPen(m_gridLineColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
+ dc.SetPen(wxPen(m_cellHighlightColour, attr->IsReadOnly() ? 1 : 3, wxSOLID));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(rect);
void wxGrid::DrawHighlight(wxDC& dc)
{
- if ( IsCellEditControlEnabled() )
+ // This if block was previously in wxGrid::OnPaint but that doesn't
+ // seem to get called under wxGTK - MB
+ //
+ if ( m_currentCellCoords == wxGridNoCellCoords &&
+ m_numRows && m_numCols )
+ {
+ m_currentCellCoords.Set(0, 0);
+ }
+
+ if ( IsCellEditControlShown() )
{
// don't show highlight when the edit control is shown
return;
// This is used to redraw all grid lines e.g. when the grid line colour
// has been changed
//
-void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
+void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) )
{
if ( !m_gridLinesEnabled ||
!m_numRows ||
int top, bottom, left, right;
+#if 0 //#ifndef __WXGTK__
if (reg.IsEmpty())
{
int cw, ch;
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
//
void wxGrid::DrawRowLabels( wxDC& dc )
{
- if ( !m_numRows || !m_numCols ) return;
+ if ( !m_numRows ) return;
size_t i;
size_t numLabels = m_rowLabelsExposed.GetCount();
void wxGrid::DrawColLabels( wxDC& dc )
{
- if ( !m_numRows || !m_numCols ) return;
+ if ( !m_numCols ) return;
size_t i;
size_t numLabels = m_colLabelsExposed.GetCount();
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;
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;
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;
}
}
*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
//
if ( edit != m_editable )
{
+ if(!edit) EnableCellEditControl(edit);
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);
}
}
// do it before ShowCellEditControl()
m_cellEditCtrlEnabled = enable;
- SetEditControlValue();
ShowCellEditControl();
}
else
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.y--;
wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellEditor* editor = attr->GetEditor(GetDefaultEditorForCell(row, col));
+ wxGridCellEditor* editor = attr->GetEditor(this, row, col);
if ( !editor->IsCreated() )
{
editor->Create(m_gridWin, -1,
new wxGridCellEditorEvtHandler(this, editor));
}
+ editor->Show( TRUE, attr );
+
editor->SetSize( rect );
- editor->Show( TRUE, attr );
editor->BeginEdit(row, col, this);
+
+ editor->DecRef();
attr->DecRef();
}
}
int col = m_currentCellCoords.GetCol();
wxGridCellAttr* attr = GetCellAttr(row, col);
- attr->GetEditor(GetDefaultEditorForCell(row, col))->Show( FALSE );
+ wxGridCellEditor *editor = attr->GetEditor(this, row, col);
+ editor->Show( FALSE );
+ editor->DecRef();
attr->DecRef();
m_gridWin->SetFocus();
+ wxRect rect( CellToRect( row, col ) );
+ m_gridWin->Refresh( FALSE, &rect );
}
}
-void wxGrid::SetEditControlValue( const wxString& value )
-{
- // RD: The new Editors get the value from the table themselves now. This
- // method can probably be removed...
-}
-
-
void wxGrid::SaveEditControlValue()
{
if ( IsCellEditControlEnabled() )
int col = m_currentCellCoords.GetCol();
wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellEditor* editor = attr->GetEditor(GetDefaultEditorForCell(row, col));
- bool changed = editor->EndEdit(row, col, TRUE, this);
+ wxGridCellEditor* editor = attr->GetEditor(this, row, col);
+ bool changed = editor->EndEdit(row, col, this);
+ editor->DecRef();
attr->DecRef();
if (changed)
return i;
}
- return m_numRows; //-1;
+ return -1;
}
return i;
}
- return m_numCols; //-1;
+ return -1;
}
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;
}
// ------ 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;
}
}
-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;
}
}
-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;
}
}
-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 );
-
- return TRUE;
+ 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;
}
return FALSE;
return FALSE;
}
-bool wxGrid::MoveCursorUpBlock()
+bool wxGrid::MoveCursorUpBlock( bool expandSelection )
{
if ( m_table &&
m_currentCellCoords != wxGridNoCellCoords &&
}
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 &&
}
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::MoveCursorLeftBlock()
+bool wxGrid::MoveCursorLeftBlock( bool expandSelection )
{
if ( m_table &&
m_currentCellCoords != wxGridNoCellCoords &&
}
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::MoveCursorRightBlock()
+bool wxGrid::MoveCursorRightBlock( bool expandSelection )
{
if ( m_table &&
m_currentCellCoords != wxGridNoCellCoords &&
}
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;
}
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;
}
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 ( rect.height > 0 )
{
CalcScrolledPosition(0, rect.y, &rect.x, &rect.y);
- rect.x = m_left;
+ rect.x = 0;
rect.width = m_rowLabelWidth;
m_rowLabelWin->Refresh( TRUE, &rect );
}
if ( rect.width > 0 )
{
CalcScrolledPosition(rect.x, 0, &rect.x, &rect.y);
- rect.y = m_top;
+ rect.y = 0;
rect.height = m_colLabelHeight;
m_colLabelWin->Refresh( TRUE, &rect );
}
}
}
+
+void wxGrid::SetCellHighlightColour( const wxColour& colour )
+{
+ if ( m_cellHighlightColour != colour )
+ {
+ m_cellHighlightColour = colour;
+
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+ DrawCellHighlight(dc, attr);
+ attr->DecRef();
+ }
+}
+
void wxGrid::EnableGridLines( bool enable )
{
if ( enable != m_gridLinesEnabled )
wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
{
- return m_defaultCellAttr->GetRenderer(NULL);
+ return m_defaultCellAttr->GetRenderer(NULL, 0, 0);
}
wxGridCellEditor *wxGrid::GetDefaultEditor() const
{
- return m_defaultCellAttr->GetEditor(NULL);
+ return m_defaultCellAttr->GetEditor(NULL,0,0);
}
// ----------------------------------------------------------------------------
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxColour colour = attr->GetBackgroundColour();
- attr->SafeDecRef();
+ attr->DecRef();
return colour;
}
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxColour colour = attr->GetTextColour();
- attr->SafeDecRef();
+ attr->DecRef();
return colour;
}
{
wxGridCellAttr *attr = GetCellAttr(row, col);
wxFont font = attr->GetFont();
- attr->SafeDecRef();
+ attr->DecRef();
return font;
}
{
wxGridCellAttr *attr = GetCellAttr(row, col);
attr->GetAlignment(horiz, vert);
- attr->SafeDecRef();
+ attr->DecRef();
}
wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
{
wxGridCellAttr* attr = GetCellAttr(row, col);
- wxGridCellRenderer* renderer = attr->GetRenderer(GetDefaultRendererForCell(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(GetDefaultEditorForCell(row, col));
+ wxGridCellEditor* editor = attr->GetEditor(this, row, col);
attr->DecRef();
+
return editor;
}
{
if ( m_attrCache.row != -1 )
{
- m_attrCache.attr->SafeDecRef();
+ wxSafeDecRef(m_attrCache.attr);
m_attrCache.row = -1;
}
}
self->m_attrCache.row = row;
self->m_attrCache.col = col;
self->m_attrCache.attr = attr;
- attr->SafeIncRef();
+ wxSafeIncRef(attr);
}
bool wxGrid::LookupAttr(int row, int col, wxGridCellAttr **attr) const
if ( row == m_attrCache.row && col == m_attrCache.col )
{
*attr = m_attrCache.attr;
- (*attr)->SafeIncRef();
+ wxSafeIncRef(m_attrCache.attr);
#ifdef DEBUG_ATTR_CACHE
gs_nAttrCacheHits++;
if ( !LookupAttr(row, col, &attr) || !attr )
{
wxASSERT_MSG( m_table,
- _T("we may only be called if CanHaveAttributes() "
- "returned TRUE and then m_table should be !NULL") );
+ _T("we may only be called if CanHaveAttributes() returned TRUE and then m_table should be !NULL") );
attr = m_table->GetAttr(row, col);
if ( !attr )
return attr;
}
+// ----------------------------------------------------------------------------
+// setting column attributes (wrappers around SetColAttr)
+// ----------------------------------------------------------------------------
+
+void wxGrid::SetColFormatBool(int col)
+{
+ SetColFormatCustom(col, wxGRID_VALUE_BOOL);
+}
+
+void wxGrid::SetColFormatNumber(int col)
+{
+ SetColFormatCustom(col, wxGRID_VALUE_NUMBER);
+}
+
+void wxGrid::SetColFormatFloat(int col, int width, int precision)
+{
+ wxString typeName = wxGRID_VALUE_FLOAT;
+ if ( (width != -1) || (precision != -1) )
+ {
+ typeName << _T(':') << width << _T(',') << precision;
+ }
+
+ SetColFormatCustom(col, typeName);
+}
+
+void wxGrid::SetColFormatCustom(int col, const wxString& typeName)
+{
+ wxGridCellAttr *attr = new wxGridCellAttr;
+ wxGridCellRenderer *renderer = GetDefaultRendererForType(typeName);
+ attr->SetRenderer(renderer);
+
+ SetColAttr(col, attr);
+}
+
// ----------------------------------------------------------------------------
// setting cell attributes: this is forwarded to the table
// ----------------------------------------------------------------------------
}
else
{
- attr->SafeDecRef();
+ wxSafeDecRef(attr);
}
}
}
else
{
- attr->SafeDecRef();
+ wxSafeDecRef(attr);
}
}
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"));
+ int index = m_typeRegistry->FindOrCloneDataType(typeName);
+ if ( index == wxNOT_FOUND )
+ {
+ wxFAIL_MSG(wxT("Unknown data type name"));
+
return NULL;
}
+
return m_typeRegistry->GetEditor(index);
}
wxGridCellRenderer*
wxGrid::GetDefaultRendererForType(const wxString& typeName) const
{
- int index = m_typeRegistry->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"));
+ int index = m_typeRegistry->FindOrCloneDataType(typeName);
+ if ( index == wxNOT_FOUND )
+ {
+ wxFAIL_MSG(wxT("Unknown data type name"));
+
return NULL;
}
+
return m_typeRegistry->GetRenderer(index);
}
m_canDragColSize = enable;
}
+void wxGrid::EnableDragGridSize( bool enable )
+{
+ m_canDragGridSize = enable;
+}
+
void wxGrid::SetDefaultRowSize( int height, bool resizeExistingRows )
{
void wxGrid::SetColMinimalWidth( int col, int width )
{
- m_colMinWidths.Put(col, (wxObject *)width);
+ m_colMinWidths.Put(col, width);
+}
+
+void wxGrid::SetRowMinimalHeight( int row, int width )
+{
+ m_rowMinHeights.Put(row, width);
}
int wxGrid::GetColMinimalWidth(int col) const
{
- wxObject *obj = m_colMinWidths.Get(m_dragRowOrCol);
- return obj ? (int)obj : WXGRID_MIN_COL_WIDTH;
+ long value = m_colMinWidths.Get(col);
+ return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_COL_WIDTH;
+}
+
+int wxGrid::GetRowMinimalHeight(int row) const
+{
+ long value = m_rowMinHeights.Get(row);
+ return value != wxNOT_FOUND ? (int)value : WXGRID_MIN_ROW_HEIGHT;
}
-void wxGrid::AutoSizeColumn( int col, bool setAsMin )
+// ----------------------------------------------------------------------------
+// auto sizing
+// ----------------------------------------------------------------------------
+
+void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
{
wxClientDC dc(m_gridWin);
- wxCoord width, widthMax = 0;
- for ( int row = 0; row < m_numRows; row++ )
+ // 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(GetDefaultRendererForCell(row,col));
+ wxGridCellRenderer* renderer = attr->GetRenderer(this, row, col);
if ( renderer )
{
- width = renderer->GetBestSize(*this, *attr, dc, row, col).x;
- if ( width > widthMax )
+ wxSize size = renderer->GetBestSize(*this, *attr, dc, row, col);
+ extent = column ? size.x : size.y;
+ if ( extent > extentMax )
{
- widthMax = width;
+ extentMax = extent;
}
+
+ renderer->DecRef();
}
attr->DecRef();
}
- // now also compare with the column label width
+ // now also compare with the column label extent
+ wxCoord w, h;
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;
- }
+ if ( column )
+ dc.GetTextExtent( GetColLabelValue(col), &w, &h );
else
- {
- // leave some space around text
- widthMax += 10;
- }
+ dc.GetTextExtent( GetRowLabelValue(col), &w, &h );
- SetColSize(col, widthMax);
- if ( setAsMin )
+ extent = column ? w : h;
+ if ( extent > extentMax )
{
- SetColMinimalWidth(col, widthMax);
+ extentMax = extent;
}
-}
-void wxGrid::AutoSizeColumns( bool setAsMin )
-{
- for ( int col = 0; col < m_numCols; col++ )
+ if ( !extentMax )
{
- AutoSizeColumn(col, setAsMin);
+ // 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;
}
-}
-
-//
-// ------ cell value accessor functions
-//
-
-void wxGrid::SetCellValue( int row, int col, const wxString& s )
-{
- if ( m_table )
+ else
{
- m_table->SetValue( row, col, s.c_str() );
- if ( !GetBatchCount() )
+ if ( column )
{
- wxClientDC dc( m_gridWin );
- PrepareDC( dc );
- DrawCell( dc, wxGridCellCoords(row, col) );
+ // leave some space around text
+ extentMax += 10;
}
-
-#if 0 // TODO: edit in place
-
- if ( m_currentCellCoords.GetRow() == row &&
- m_currentCellCoords.GetCol() == col )
+ else
{
- SetEditControlValue( s );
+ extentMax += 6;
}
-#endif
-
}
-}
+ if ( column )
+ SetColSize(col, extentMax);
+ else
+ SetRowSize(row, extentMax);
-//
-// ------ Block, row and col selection
-//
+ if ( setAsMin )
+ {
+ if ( column )
+ SetColMinimalWidth(col, extentMax);
+ else
+ SetRowMinimalHeight(row, extentMax);
+ }
+}
-void wxGrid::SelectRow( int row, bool addToSelected )
+int wxGrid::SetOrCalcColumnSizes(bool calcOnly, bool setAsMin)
{
- wxRect r;
+ int width = m_rowLabelWidth;
- if ( IsSelection() && addToSelected )
+ for ( int col = 0; col < m_numCols; col++ )
{
- wxRect rect[4];
- bool need_refresh[4];
- need_refresh[0] =
- need_refresh[1] =
- need_refresh[2] =
- need_refresh[3] = FALSE;
-
- int i;
-
- wxCoord oldLeft = m_selectedTopLeft.GetCol();
- wxCoord oldTop = m_selectedTopLeft.GetRow();
- wxCoord oldRight = m_selectedBottomRight.GetCol();
- wxCoord oldBottom = m_selectedBottomRight.GetRow();
-
- if ( oldTop > row )
+ if ( !calcOnly )
{
- need_refresh[0] = TRUE;
- rect[0] = BlockToDeviceRect( wxGridCellCoords ( row, 0 ),
- wxGridCellCoords ( oldTop - 1,
- m_numCols - 1 ) );
- m_selectedTopLeft.SetRow( row );
- }
-
- if ( oldLeft > 0 )
- {
- need_refresh[1] = TRUE;
- rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop, 0 ),
- wxGridCellCoords ( oldBottom,
- oldLeft - 1 ) );
-
- m_selectedTopLeft.SetCol( 0 );
- }
-
- if ( oldBottom < row )
- {
- need_refresh[2] = TRUE;
- rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1, 0 ),
- wxGridCellCoords ( row,
- m_numCols - 1 ) );
- m_selectedBottomRight.SetRow( row );
+ AutoSizeColumn(col, setAsMin);
}
- if ( oldRight < m_numCols - 1 )
- {
- need_refresh[3] = TRUE;
- rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldTop ,
- oldRight + 1 ),
- wxGridCellCoords ( oldBottom,
- m_numCols - 1 ) );
- m_selectedBottomRight.SetCol( m_numCols - 1 );
- }
-
- for (i = 0; i < 4; i++ )
- if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( FALSE, &(rect[i]) );
+ width += GetColWidth(col);
}
- else
- {
- r = SelectionToDeviceRect();
- ClearSelection();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
- m_selectedTopLeft.Set( row, 0 );
- m_selectedBottomRight.Set( row, m_numCols-1 );
- r = SelectionToDeviceRect();
- m_gridWin->Refresh( FALSE, &r );
- }
-
- wxGridRangeSelectEvent gridEvt( GetId(),
- wxEVT_GRID_RANGE_SELECT,
- this,
- m_selectedTopLeft,
- m_selectedBottomRight );
-
- GetEventHandler()->ProcessEvent(gridEvt);
+ return width;
}
-
-void wxGrid::SelectCol( int col, bool addToSelected )
+int wxGrid::SetOrCalcRowSizes(bool calcOnly, bool setAsMin)
{
- if ( IsSelection() && addToSelected )
- {
- wxRect rect[4];
- bool need_refresh[4];
- need_refresh[0] =
- need_refresh[1] =
- need_refresh[2] =
- need_refresh[3] = FALSE;
- int i;
-
- wxCoord oldLeft = m_selectedTopLeft.GetCol();
- wxCoord oldTop = m_selectedTopLeft.GetRow();
- wxCoord oldRight = m_selectedBottomRight.GetCol();
- wxCoord oldBottom = m_selectedBottomRight.GetRow();
-
- if ( oldLeft > col )
- {
- need_refresh[0] = TRUE;
- rect[0] = BlockToDeviceRect( wxGridCellCoords ( 0, col ),
- wxGridCellCoords ( m_numRows - 1,
- oldLeft - 1 ) );
- m_selectedTopLeft.SetCol( col );
- }
-
- if ( oldTop > 0 )
- {
- need_refresh[1] = TRUE;
- rect[1] = BlockToDeviceRect( wxGridCellCoords ( 0, oldLeft ),
- wxGridCellCoords ( oldTop - 1,
- oldRight ) );
- m_selectedTopLeft.SetRow( 0 );
- }
+ int height = m_colLabelHeight;
- if ( oldRight < col )
+ for ( int row = 0; row < m_numRows; row++ )
+ {
+ if ( !calcOnly )
{
- need_refresh[2] = TRUE;
- rect[2] = BlockToDeviceRect( wxGridCellCoords ( 0, oldRight + 1 ),
- wxGridCellCoords ( m_numRows - 1,
- col ) );
- m_selectedBottomRight.SetCol( col );
+ AutoSizeRow(row, setAsMin);
}
- if ( oldBottom < m_numRows - 1 )
- {
- need_refresh[3] = TRUE;
- rect[3] = BlockToDeviceRect( wxGridCellCoords ( oldBottom + 1,
- oldLeft ),
- wxGridCellCoords ( m_numRows - 1,
- oldRight ) );
- m_selectedBottomRight.SetRow( m_numRows - 1 );
- }
-
- for (i = 0; i < 4; i++ )
- if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( FALSE, &(rect[i]) );
+ height += GetRowHeight(row);
}
- else
- {
- wxRect r;
- r = SelectionToDeviceRect();
- ClearSelection();
- if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );
+ return height;
+}
- m_selectedTopLeft.Set( 0, col );
- m_selectedBottomRight.Set( m_numRows-1, col );
- r = SelectionToDeviceRect();
- m_gridWin->Refresh( FALSE, &r );
- }
+void wxGrid::AutoSize()
+{
+ // set the size too
+ SetSize(SetOrCalcColumnSizes(FALSE), SetOrCalcRowSizes(FALSE));
+}
- wxGridRangeSelectEvent gridEvt( GetId(),
- wxEVT_GRID_RANGE_SELECT,
- this,
- m_selectedTopLeft,
- m_selectedBottomRight );
+wxSize wxGrid::DoGetBestSize() const
+{
+ // don't set sizes, only calculate them
+ wxGrid *self = (wxGrid *)this; // const_cast
- GetEventHandler()->ProcessEvent(gridEvt);
+ return wxSize(self->SetOrCalcColumnSizes(TRUE),
+ self->SetOrCalcRowSizes(TRUE));
}
-
-void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
+void wxGrid::Fit()
{
- int temp;
- wxGridCellCoords updateTopLeft, updateBottomRight;
+ AutoSize();
+}
- if ( topRow > bottomRow )
- {
- temp = topRow;
- topRow = bottomRow;
- bottomRow = temp;
- }
- if ( leftCol > rightCol )
- {
- temp = leftCol;
- leftCol = rightCol;
- rightCol = temp;
- }
+wxPen& wxGrid::GetDividerPen() const
+{
+ return wxNullPen;
+}
- updateTopLeft = wxGridCellCoords( topRow, leftCol );
- updateBottomRight = wxGridCellCoords( bottomRow, rightCol );
+// ----------------------------------------------------------------------------
+// cell value accessor functions
+// ----------------------------------------------------------------------------
- if ( m_selectedTopLeft != updateTopLeft ||
- m_selectedBottomRight != updateBottomRight )
+void wxGrid::SetCellValue( int row, int col, const wxString& s )
+{
+ if ( m_table )
{
- // Compute two optimal update rectangles:
- // Either one rectangle is a real subset of the
- // other, or they are (almost) disjoint!
- wxRect rect[4];
- bool need_refresh[4];
- need_refresh[0] =
- need_refresh[1] =
- need_refresh[2] =
- need_refresh[3] = FALSE;
- int i;
-
- // Store intermediate values
- wxCoord oldLeft = m_selectedTopLeft.GetCol();
- wxCoord oldTop = m_selectedTopLeft.GetRow();
- wxCoord oldRight = m_selectedBottomRight.GetCol();
- wxCoord oldBottom = m_selectedBottomRight.GetRow();
-
- // Determine the outer/inner coordinates.
- if (oldLeft > leftCol)
- {
- temp = oldLeft;
- oldLeft = leftCol;
- leftCol = temp;
- }
- if (oldTop > topRow )
- {
- temp = oldTop;
- oldTop = topRow;
- topRow = temp;
- }
- if (oldRight < rightCol )
+ m_table->SetValue( row, col, s );
+ if ( !GetBatchCount() )
{
- temp = oldRight;
- oldRight = rightCol;
- rightCol = temp;
+ wxClientDC dc( m_gridWin );
+ PrepareDC( dc );
+ DrawCell( dc, wxGridCellCoords(row, col) );
}
- if (oldBottom < bottomRow)
+
+ if ( m_currentCellCoords.GetRow() == row &&
+ m_currentCellCoords.GetCol() == col &&
+ IsCellEditControlShown())
+ // Note: If we are using IsCellEditControlEnabled,
+ // this interacts badly with calling SetCellValue from
+ // an EVT_GRID_CELL_CHANGE handler.
{
- temp = oldBottom;
- oldBottom = bottomRow;
- bottomRow = temp;
+ HideCellEditControl();
+ ShowCellEditControl(); // will reread data from table
}
+ }
+}
- // Now, either the stuff marked old is the outer
- // rectangle or we don't have a situation where one
- // is contained in the other.
- if ( oldLeft < leftCol )
- {
- need_refresh[0] = TRUE;
- rect[0] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- oldLeft ),
- wxGridCellCoords ( oldBottom,
- leftCol - 1 ) );
- }
+//
+// ------ Block, row and col selection
+//
- if ( oldTop < topRow )
- {
- need_refresh[1] = TRUE;
- rect[1] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- leftCol ),
- wxGridCellCoords ( topRow - 1,
- rightCol ) );
- }
+void wxGrid::SelectRow( int row, bool addToSelected )
+{
+ if ( IsSelection() && !addToSelected )
+ ClearSelection();
- if ( oldRight > rightCol )
- {
- need_refresh[2] = TRUE;
- rect[2] = BlockToDeviceRect( wxGridCellCoords ( oldTop,
- rightCol + 1 ),
- wxGridCellCoords ( oldBottom,
- oldRight ) );
- }
+ m_selection->SelectRow( row, FALSE, addToSelected );
+}
- if ( oldBottom > bottomRow )
- {
- need_refresh[3] = TRUE;
- rect[3] = BlockToDeviceRect( wxGridCellCoords ( bottomRow + 1,
- leftCol ),
- wxGridCellCoords ( oldBottom,
- rightCol ) );
- }
+void wxGrid::SelectCol( int col, bool addToSelected )
+{
+ if ( IsSelection() && !addToSelected )
+ ClearSelection();
- // Change Selection
- m_selectedTopLeft = updateTopLeft;
- m_selectedBottomRight = updateBottomRight;
+ m_selection->SelectCol( col, FALSE, addToSelected );
+}
- // various Refresh() calls
- for (i = 0; i < 4; i++ )
- if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
- m_gridWin->Refresh( FALSE, &(rect[i]) );
- }
- // only generate an event if the block is not being selected by
- // dragging the mouse (in which case the event will be generated in
- // the mouse event handler)
- if ( !m_isDragging )
- {
- wxGridRangeSelectEvent gridEvt( GetId(),
- wxEVT_GRID_RANGE_SELECT,
- this,
- m_selectedTopLeft,
- m_selectedBottomRight );
+void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
+ bool addToSelected )
+{
+ if ( IsSelection() && !addToSelected )
+ ClearSelection();
- GetEventHandler()->ProcessEvent(gridEvt);
- }
+ m_selection->SelectBlock( topRow, leftCol, bottomRow, rightCol,
+ FALSE, addToSelected );
}
+
void wxGrid::SelectAll()
{
- m_selectedTopLeft.Set( 0, 0 );
- m_selectedBottomRight.Set( m_numRows-1, m_numCols-1 );
+ m_selection->SelectBlock( 0, 0, m_numRows-1, m_numCols-1 );
+}
- m_gridWin->Refresh();
+bool wxGrid::IsSelection()
+{
+ return ( m_selection->IsSelection() ||
+ ( m_selectingTopLeft != wxGridNoCellCoords &&
+ m_selectingBottomRight != wxGridNoCellCoords ) );
}
+bool wxGrid::IsInSelection( int row, int col )
+{
+ return ( m_selection->IsInSelection( row, col ) ||
+ ( row >= m_selectingTopLeft.GetRow() &&
+ col >= m_selectingTopLeft.GetCol() &&
+ row <= m_selectingBottomRight.GetRow() &&
+ col <= m_selectingBottomRight.GetCol() ) );
+}
void wxGrid::ClearSelection()
{
- m_selectedTopLeft = wxGridNoCellCoords;
- m_selectedBottomRight = wxGridNoCellCoords;
+ m_selectingTopLeft = wxGridNoCellCoords;
+ m_selectingBottomRight = wxGridNoCellCoords;
+ m_selection->ClearSelection();
}
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) );
IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxEvent )
wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
- int row, int col, int x, int y,
+ int row, int col, int x, int y, bool sel,
bool control, bool shift, bool alt, bool meta )
: wxNotifyEvent( type, id )
{
m_col = col;
m_x = x;
m_y = y;
+ m_selecting = sel;
m_control = control;
m_shift = shift;
m_alt = alt;
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;
#endif // ifndef wxUSE_NEW_GRID
-
projects / wxWidgets.git / blobdiff