// this include needs to be outside precomp for BCC
#include "wx/textfile.h"
-#include "wx/generic/grid.h"
+#include "wx/grid.h"
+
// ----------------------------------------------------------------------------
// array classes
}
+void wxGridCellEditor::StartingKey(wxKeyEvent& event)
+{
+}
+
+
+
wxGridCellTextEditor::wxGridCellTextEditor()
{
}
void wxGridCellTextEditor::Create(wxWindow* parent,
wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
wxEvtHandler* evtHandler)
{
- m_control = new wxTextCtrl(parent, -1, "", pos, size
+ m_control = new wxTextCtrl(parent, -1, "",
+ wxDefaultPosition, wxDefaultSize
#if defined(__WXMSW__)
- , wxTE_MULTILINE | wxTE_NO_VSCROLL
+ , wxTE_MULTILINE | wxTE_NO_VSCROLL // necessary ???
#endif
);
if (changed)
grid->GetTable()->SetValue(row, col, value);
+
m_startValue = "";
+ ((wxTextCtrl*)m_control)->SetValue(m_startValue);
return changed;
}
((wxTextCtrl*)m_control)->SetInsertionPointEnd();
}
+
+void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
+{
+ wxASSERT_MSG(m_control,
+ wxT("The wxGridCellEditor must be Created first!"));
+
+ int code = event.KeyCode();
+ if (code >= 32 && code < 255) {
+ wxString st((char)code);
+ if (! event.ShiftDown())
+ st.LowerCase();
+ ((wxTextCtrl*)m_control)->AppendText(st);
+ }
+}
+
+
void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event)
{
#if defined(__WXMOTIF__) || defined(__WXGTK__)
{
case WXK_ESCAPE:
m_editor->Reset();
+ m_grid->EnableCellEditControl(FALSE);
break;
- case WXK_UP:
- case WXK_DOWN:
- case WXK_LEFT:
- case WXK_RIGHT:
- case WXK_PRIOR:
- case WXK_NEXT:
- case WXK_SPACE:
- // send the event to the parent grid, skipping the
- // event if nothing happens
- //
- event.Skip( m_grid->ProcessEvent( event ) );
- break;
-
+// case WXK_UP:
+// case WXK_DOWN:
+// case WXK_LEFT:
+// case WXK_RIGHT:
+// case WXK_PRIOR:
+// case WXK_NEXT:
+// case WXK_SPACE:
+// case WXK_HOME:
+// case WXK_END:
+// // send the event to the parent grid, skipping the
+// // event if nothing happens
+// //
+// event.Skip( m_grid->ProcessEvent( event ) );
+// break;
+
+ case WXK_TAB:
case WXK_RETURN:
if (!m_grid->ProcessEvent(event))
m_editor->HandleReturn(event);
break;
- case WXK_HOME:
- case WXK_END:
- // send the event to the parent grid, skipping the
- // event if nothing happens
- //
- event.Skip( m_grid->ProcessEvent( event ) );
- break;
default:
event.Skip();
}
}
+wxGridCellEditor* wxGridCellAttr::GetEditor() const
+{
+ if (HasEditor())
+ return m_editor;
+ else if (m_defGridAttr != this)
+ return m_defGridAttr->GetEditor();
+ else {
+ wxFAIL_MSG(wxT("Missing default cell attribute"));
+ return NULL;
+ }
+}
+
// ----------------------------------------------------------------------------
// wxGridCellAttrData
// ----------------------------------------------------------------------------
//////////////////////////////////////////////////////////////////////
-
-IMPLEMENT_DYNAMIC_CLASS( wxGridTextCtrl, wxTextCtrl )
-
-BEGIN_EVENT_TABLE( wxGridTextCtrl, wxTextCtrl )
- EVT_KEY_DOWN( wxGridTextCtrl::OnKeyDown )
-END_EVENT_TABLE()
-
-
-wxGridTextCtrl::wxGridTextCtrl( wxWindow *par,
- wxGrid *grid,
- bool isCellControl,
- wxWindowID id,
- const wxString& value,
- const wxPoint& pos,
- const wxSize& size,
- long style )
- : wxTextCtrl( par, id, value, pos, size, style )
-{
- m_grid = grid;
- m_isCellControl = isCellControl;
-}
-
-
-void wxGridTextCtrl::OnKeyDown( wxKeyEvent& event )
-{
- switch ( event.KeyCode() )
- {
-#if 0
- case WXK_ESCAPE:
- m_grid->SetEditControlValue( startValue );
- SetInsertionPointEnd();
- break;
-#else
- case WXK_ESCAPE:
- m_grid->EnableCellEditControl( FALSE );
-#endif
- case WXK_UP:
- case WXK_DOWN:
- case WXK_LEFT:
- case WXK_RIGHT:
- case WXK_PRIOR:
- case WXK_NEXT:
- case WXK_SPACE:
- if ( m_isCellControl )
- {
- // send the event to the parent grid, skipping the
- // event if nothing happens
- //
- event.Skip( m_grid->ProcessEvent( event ) );
- }
- else
- {
- // default text control response within the top edit
- // control
- //
- event.Skip();
- }
- break;
-
- case WXK_RETURN:
- if ( m_isCellControl )
- {
- if ( !m_grid->ProcessEvent( event ) )
- {
-#if defined(__WXMOTIF__) || defined(__WXGTK__)
- // wxMotif needs a little extra help...
- //
- int pos = GetInsertionPoint();
- wxString s( GetValue() );
- s = s.Left(pos) + "\n" + s.Mid(pos);
- SetValue(s);
- SetInsertionPoint( pos );
-#else
- // the other ports can handle a Return key press
- //
- event.Skip();
-#endif
- }
- }
- break;
- case WXK_HOME:
- case WXK_END:
- if ( m_isCellControl )
- {
- // send the event to the parent grid, skipping the
- // event if nothing happens
- //
- event.Skip( m_grid->ProcessEvent( event ) );
- }
- else
- {
- // default text control response within the top edit
- // control
- //
- event.Skip();
- }
- break;
-
- default:
- event.Skip();
- }
-}
-
-void wxGridTextCtrl::SetStartValue( const wxString& s )
-{
- startValue = s;
- wxTextCtrl::SetValue(s);
-}
-
-
-
//////////////////////////////////////////////////////////////////////
IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
{ }
-//-----------------------------------------------------------------------------
-// wxGridEditTimer (internal)
-//-----------------------------------------------------------------------------
-
-wxGridEditTimer::wxGridEditTimer( wxGrid *owner )
-{
- m_owner = owner;
-}
-
-void wxGridEditTimer::Notify()
-{
- m_owner->EnableCellEditControl( TRUE );
-}
//////////////////////////////////////////////////////////////////////
+
IMPLEMENT_DYNAMIC_CLASS( wxGrid, wxScrolledWindow )
BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
if (m_ownTable)
delete m_table;
- delete m_editTimer;
}
void wxGrid::Create()
{
m_created = FALSE; // set to TRUE by CreateGrid
- m_displayed = FALSE; // set to TRUE by OnPaint
+ m_displayed = TRUE; // FALSE; // set to TRUE by OnPaint
m_table = (wxGridTableBase *) NULL;
m_ownTable = FALSE;
- m_cellEditCtrl = (wxWindow *) NULL;
+
+ m_cellEditCtrlEnabled = FALSE;
m_defaultCellAttr = new wxGridCellAttr;
m_defaultCellAttr->SetDefAttr(m_defaultCellAttr);
{
if ( m_created )
{
+ // RD: Actually, this should probably be allowed. I think it would be
+ // nice to be able to switch multiple Tables in and out of a single
+ // View at runtime. Is there anything in the implmentation that would
+ // prevent this?
+
wxFAIL_MSG( wxT("wxGrid::CreateGrid or wxGrid::SetTable called more than once") );
return FALSE;
}
m_colRights.Add( colRight );
}
+ // Set default cell attributes
m_defaultCellAttr->SetFont(GetFont());
m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP);
m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
+ m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
m_defaultCellAttr->SetTextColour(
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
m_defaultCellAttr->SetBackgroundColour(
m_dragLastPos = -1;
m_dragRowOrCol = -1;
m_isDragging = FALSE;
+ m_startDragPos = wxDefaultPosition;
- m_editTimer = new wxGridEditTimer ( this );
+ m_waitForSlowClick = FALSE;
m_rowResizeCursor = wxCursor( wxCURSOR_SIZENS );
m_colResizeCursor = wxCursor( wxCURSOR_SIZEWE );
m_inOnKeyDown = FALSE;
m_batchCount = 0;
- // TODO: extend this to other types of controls
- //
- m_cellEditCtrl = new wxGridTextCtrl( m_gridWin,
- this,
- FALSE,
- wxGRID_CELLCTRL,
- "",
- wxPoint(1,1),
- wxSize(1,1)
-#if defined(__WXMSW__)
- , wxTE_MULTILINE | wxTE_NO_VSCROLL
-#endif
- );
-
- m_cellEditCtrl->Show( FALSE );
- m_cellEditCtrlEnabled = FALSE;
- m_editCtrlType = wxGRID_TEXTCTRL;
}
int colLeft, rowTop;
for ( row = 0; row < m_numRows; row++ )
{
- if ( m_rowBottoms[row] < top ) continue;
+ if ( m_rowBottoms[row] <= top ) continue;
rowTop = m_rowBottoms[row] - m_rowHeights[row];
if ( rowTop > bottom ) break;
for ( col = 0; col < m_numCols; col++ )
{
- if ( m_colRights[col] < left ) continue;
+ if ( m_colRights[col] <= left ) continue;
colLeft = m_colRights[col] - m_colWidths[col];
if ( colLeft > right ) break;
if ( event.Dragging() )
{
+ //wxLogDebug("pos(%d, %d) coords(%d, %d)", pos.x, pos.y, coords.GetRow(), coords.GetCol());
+
+ // Don't start doing anything until the mouse has been drug at
+ // least 3 pixels in any direction...
+ if (! m_isDragging) {
+ if (m_startDragPos == wxDefaultPosition) {
+ m_startDragPos = pos;
+ return;
+ }
+ if (abs(m_startDragPos.x - pos.x) < 4 && abs(m_startDragPos.y - pos.y) < 4)
+ return;
+ }
+
m_isDragging = TRUE;
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
// won't interfer with drag-shrinking.
if ( IsCellEditControlEnabled() )
HideCellEditControl();
+
+ // Have we captured the mouse yet?
+ if (! m_winCapture) {
+ m_winCapture = m_gridWin;
+ m_winCapture->CaptureMouse();
+ }
+
if ( coords != wxGridNoCellCoords )
{
if ( !IsSelection() )
{
SelectBlock( 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.
+ }
}
}
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
}
m_isDragging = FALSE;
+ m_startDragPos = wxDefaultPosition;
+
if ( coords != wxGridNoCellCoords )
{
event ) )
{
MakeCellVisible( coords );
- SetCurrentCell( coords );
+
+ // if this is the second click on this cell then start
+ // the edit control
+ if (m_waitForSlowClick && coords == m_currentCellCoords) {
+ EnableCellEditControl(TRUE);
+ ShowCellEditControl();
+ m_waitForSlowClick = FALSE;
+ }
+ else {
+ SetCurrentCell( coords );
+ m_waitForSlowClick = TRUE;
+ }
}
}
}
else if ( event.LeftDClick() )
{
EnableCellEditControl( FALSE );
- m_editTimer->Stop();
if ( XToEdgeOfCol(x) < 0 && YToEdgeOfRow(y) < 0 )
{
SendEvent( EVT_GRID_CELL_LEFT_DCLICK,
{
if ( IsSelection() )
{
+ if (m_winCapture) {
+ m_winCapture->ReleaseMouse();
+ m_winCapture = NULL;
+ }
SendEvent( EVT_GRID_RANGE_SELECT, -1, -1, event );
}
// been hidden for drag-shrinking.
if ( IsCellEditControlEnabled() )
ShowCellEditControl();
- if( IsEditable() && coords == m_currentCellCoords )
- m_editTimer->Start( 100, TRUE );
}
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
{
{
// shouldn't be here - we are going round in circles...
//
- wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while alread active") );
+ wxFAIL_MSG( wxT("wxGrid::OnKeyDown called while already active") );
}
m_inOnKeyDown = TRUE;
}
break;
- case WXK_SPACE:
- if ( !IsEditable() )
- {
- MoveCursorRight();
- }
- else
- {
- event.Skip();
- }
- break;
-
case WXK_RETURN:
if ( event.ControlDown() )
{
}
break;
+ case WXK_TAB:
+ if (event.ShiftDown())
+ MoveCursorLeft();
+ else
+ MoveCursorRight();
+ break;
+
case WXK_HOME:
if ( event.ControlDown() )
{
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 ( !IsEditable() )
+ {
+ MoveCursorRight();
+ break;
+ }
+ // Otherwise fall through to default
+
default:
// now try the cell edit control
//
if ( !IsCellEditControlEnabled() )
EnableCellEditControl( TRUE );
- if ( IsCellEditControlEnabled() )
- {
- event.SetEventObject( m_cellEditCtrl );
- m_cellEditCtrl->GetEventHandler()->ProcessEvent( event );
+ if (IsCellEditControlEnabled()) {
+ wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
+ attr->GetEditor()->StartingKey(event);
+ attr->DecRef();
}
break;
}
m_inOnKeyDown = FALSE;
}
+
void wxGrid::OnEraseBackground(wxEraseEvent&)
{ }
+
+
+
void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
{
if ( SendEvent( EVT_GRID_SELECT_CELL, coords.GetRow(), coords.GetCol() ) )
{
HideCellEditControl();
SaveEditControlValue();
+ EnableCellEditControl(FALSE);
+
+ // Clear the old current cell highlight
+ wxRect r = BlockToDeviceRect(m_currentCellCoords, m_currentCellCoords);
+ m_currentCellCoords = coords; // Otherwise refresh redraws the highlight!
+ m_gridWin->Refresh( FALSE, &r );
}
m_currentCellCoords = coords;
SetEditControlValue();
-#if 0
+
if ( m_displayed )
{
- ShowCellEditControl();
+ wxClientDC dc(m_gridWin);
+ PrepareDC(dc);
+ DrawCellHighlight(dc);
if ( IsSelection() )
{
if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );
}
}
-#else
- SelectBlock ( coords, coords );
-#endif
}
wxRect rect;
rect.x = m_colRights[col] - m_colWidths[col];
rect.y = m_rowBottoms[row] - m_rowHeights[row];
- rect.width = m_colWidths[col] - 1;
- rect.height = m_rowHeights[row] - 1;
+ rect.width = m_colWidths[col];
+ rect.height = m_rowHeights[row];
wxGridCellAttr* attr = GetCellAttr(row, col);
attr->GetRenderer()->Draw(*this, *attr, dc, rect, row, col, IsInSelection(coords));
attr->DecRef();
+
+ if (m_currentCellCoords == coords)
+ DrawCellHighlight(dc);
+}
+
+
+void wxGrid::DrawCellHighlight( wxDC& dc )
+{
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
+
+ if ( m_colWidths[col] <= 0 || m_rowHeights[row] <= 0 )
+ return;
+
+ wxRect rect;
+ rect.x = m_colRights[col] - m_colWidths[col];
+ rect.y = m_rowBottoms[row] - m_rowHeights[row];
+ rect.width = m_colWidths[col] - 1;
+ rect.height = m_rowHeights[row] - 1;
+
+ dc.SetPen(wxPen(m_gridLineColour, 3, wxSOLID));
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+
+ dc.DrawRectangle(rect);
}
void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
{
m_editable = edit;
- // TODO: extend this for other edit control types
- //
- if ( m_editCtrlType == wxGRID_TEXTCTRL )
- {
- ((wxTextCtrl *)m_cellEditCtrl)->SetEditable( m_editable );
- }
+ EnableCellEditControl(m_editable);
}
}
void wxGrid::EnableCellEditControl( bool enable )
{
+ if (! m_editable)
+ return;
+
if ( m_currentCellCoords == wxGridNoCellCoords )
SetCurrentCell( 0, 0 );
- if ( m_cellEditCtrl &&
- enable != m_cellEditCtrlEnabled )
- {
+ if ( enable != m_cellEditCtrlEnabled )
+ {
if ( enable )
{
m_cellEditCtrlEnabled = enable;
SetEditControlValue();
- // requires m_cellEditCtrlEnabled to be already true
ShowCellEditControl();
}
else
{
HideCellEditControl();
- // requires m_cellEditCtrlEnabled to be still true
SaveEditControlValue();
m_cellEditCtrlEnabled = enable;
}
void wxGrid::ShowCellEditControl()
{
- wxRect rect;
-
if ( IsCellEditControlEnabled() )
{
if ( !IsVisible( m_currentCellCoords ) )
}
else
{
- rect = CellToRect( m_currentCellCoords );
+ wxRect rect = CellToRect( m_currentCellCoords );
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
// convert to scrolled coords
//
//
int extra;
#if defined(__WXMOTIF__)
- if ( m_currentCellCoords.GetRow() == 0 ||
- m_currentCellCoords.GetCol() == 0 )
+ if ( row == 0 || col == 0 )
{
extra = 2;
}
extra = 4;
}
#else
- if ( m_currentCellCoords.GetRow() == 0 ||
- m_currentCellCoords.GetCol() == 0 )
+ if ( row == 0 || col == 0 )
{
extra = 1;
}
rect.SetBottom( rect.GetBottom() + 2*extra );
#endif
- m_cellEditCtrl->SetSize( rect );
- m_cellEditCtrl->Show( TRUE );
-
- switch ( m_editCtrlType )
- {
- case wxGRID_TEXTCTRL:
- ((wxTextCtrl *) m_cellEditCtrl)->SetInsertionPointEnd();
- break;
-
- case wxGRID_CHECKBOX:
- // TODO: anything ???
- //
- break;
-
- case wxGRID_CHOICE:
- // TODO: anything ???
- //
- break;
-
- case wxGRID_COMBOBOX:
- // TODO: anything ???
- //
- break;
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ wxGridCellEditor* editor = attr->GetEditor();
+ if (! editor->IsCreated()) {
+ editor->Create(m_gridWin, -1,
+ new wxGridCellEditorEvtHandler(this, editor));
}
- m_cellEditCtrl->SetFocus();
- }
+ editor->SetSize( rect );
+ editor->Show( TRUE );
+ editor->BeginEdit(row, col, this, attr);
+ attr->DecRef();
+ }
}
}
{
if ( IsCellEditControlEnabled() )
{
- m_cellEditCtrl->Show( FALSE );
- SetFocus();
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
+
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ attr->GetEditor()->Show( FALSE );
+ attr->DecRef();
+ m_gridWin->SetFocus();
}
}
void wxGrid::SetEditControlValue( const wxString& value )
{
- if ( m_table )
- {
- wxString s;
- if ( !value )
- s = GetCellValue(m_currentCellCoords);
- else
- s = value;
-
- if ( IsCellEditControlEnabled() )
- {
- switch ( m_editCtrlType )
- {
- case wxGRID_TEXTCTRL:
- ((wxGridTextCtrl *)m_cellEditCtrl)->SetStartValue(s);
- break;
-
- case wxGRID_CHECKBOX:
- // TODO: implement this
- //
- break;
-
- case wxGRID_CHOICE:
- // TODO: implement this
- //
- break;
-
- case wxGRID_COMBOBOX:
- // TODO: implement this
- //
- break;
- }
- }
- }
+ // RD: The new Editors get the value from the table themselves now. This
+ // method can probably be removed...
}
void wxGrid::SaveEditControlValue()
{
- if ( m_table )
- {
- wxWindow *ctrl = (wxWindow *)NULL;
-
- if ( IsCellEditControlEnabled() )
- {
- ctrl = m_cellEditCtrl;
- }
- else
- {
- return;
- }
-
- bool valueChanged = FALSE;
-
- switch ( m_editCtrlType )
- {
- case wxGRID_TEXTCTRL:
- valueChanged = (((wxGridTextCtrl *)ctrl)->GetValue() !=
- ((wxGridTextCtrl *)ctrl)->GetStartValue());
- SetCellValue( m_currentCellCoords,
- ((wxTextCtrl *) ctrl)->GetValue() );
- break;
-
- case wxGRID_CHECKBOX:
- // TODO: implement this
- //
- break;
+ if (IsCellEditControlEnabled()) {
+ int row = m_currentCellCoords.GetRow();
+ int col = m_currentCellCoords.GetCol();
- case wxGRID_CHOICE:
- // TODO: implement this
- //
- break;
+ wxGridCellAttr* attr = GetCellAttr(row, col);
+ bool changed = attr->GetEditor()->EndEdit(row, col, TRUE, this, attr);
- case wxGRID_COMBOBOX:
- // TODO: implement this
- //
- break;
- }
+ attr->DecRef();
- if ( valueChanged )
- {
+ if (changed) {
SendEvent( EVT_GRID_CELL_CHANGE,
m_currentCellCoords.GetRow(),
m_currentCellCoords.GetCol() );
if ( y < m_rowBottoms[i] ) return i;
}
- return -1;
+ return m_numRows; //-1;
}
if ( x < m_colRights[i] ) return i;
}
- return -1;
+ return m_numCols; //-1;
}
projects / wxWidgets.git / blobdiff