AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added getters/setters for cell and grid-default editors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2000-02-16 17:51:33 +00:00
parent 615a9936a4
commit 9b4aede26d
2 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/grid.h
View File

@ -784,6 +784,12 @@ public:
wxGridCellRenderer *GetDefaultRenderer() const;
wxGridCellRenderer* GetCellRenderer(int row, int col);
// takes ownership of the pointer
void SetDefaultEditor(wxGridCellEditor *editor);
void SetCellEditor(int row, int col, wxGridCellEditor *editor);
wxGridCellEditor *GetDefaultEditor() const;
wxGridCellEditor* GetCellEditor(int row, int col);
// ------ cell value accessors
//

56
src/generic/grid.cpp
View File

@ -431,22 +431,10 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
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:
// 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:
event.Skip( m_grid->ProcessEvent( event ) );
break;
case WXK_RETURN:
if (!m_grid->ProcessEvent(event))
m_editor->HandleReturn(event);
@ -1296,7 +1284,7 @@ bool wxGridStringTable::DeleteRows( size_t pos, size_t numRows )
m_data.Remove( pos );
}
}
UpdateAttrRows( pos, -numRows );
UpdateAttrRows( pos, -((int)numRows) );
if ( GetView() )
{
wxGridTableMessage msg( this,
@ -1413,7 +1401,7 @@ bool wxGridStringTable::DeleteCols( size_t pos, size_t numCols )
}
}
}
UpdateAttrCols( pos, -numCols );
UpdateAttrCols( pos, -((int)numCols) );
if ( GetView() )
{
wxGridTableMessage msg( this,
@ -3551,6 +3539,12 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
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() )
@ -5186,6 +5180,11 @@ void wxGrid::SetDefaultRenderer(wxGridCellRenderer *renderer)
m_defaultCellAttr->SetRenderer(renderer);
}
void wxGrid::SetDefaultEditor(wxGridCellEditor *editor)
{
m_defaultCellAttr->SetEditor(editor);
}
// ----------------------------------------------------------------------------
// access to the default attrbiutes
// ----------------------------------------------------------------------------
@ -5215,6 +5214,11 @@ wxGridCellRenderer *wxGrid::GetDefaultRenderer() const
return m_defaultCellAttr->GetRenderer();
}
wxGridCellEditor *wxGrid::GetDefaultEditor() const
{
return m_defaultCellAttr->GetEditor();
}
// ----------------------------------------------------------------------------
// access to cell attributes
// ----------------------------------------------------------------------------
@ -5258,6 +5262,14 @@ wxGridCellRenderer* wxGrid::GetCellRenderer(int row, int col)
return renderer;
}
wxGridCellEditor* wxGrid::GetCellEditor(int row, int col)
{
wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor();
attr->DecRef();
return editor;
}
// ----------------------------------------------------------------------------
// attribute support: cache, automatic provider creation, ...
// ----------------------------------------------------------------------------
@ -5448,6 +5460,16 @@ void wxGrid::SetCellRenderer(int row, int col, wxGridCellRenderer *renderer)
}
}
void wxGrid::SetCellEditor(int row, int col, wxGridCellEditor* editor)
{
if ( CanHaveAttributes() )
{
wxGridCellAttr *attr = GetOrCreateCellAttr(row, col);
attr->SetEditor(editor);
attr->DecRef();
}
}
// ----------------------------------------------------------------------------
// row/col size
// ----------------------------------------------------------------------------