added wxGridCellEditor::StartingClick(), used by BoolEditor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -167,6 +167,10 @@ public:
|
|||||||
// that first key if desired.
|
// that first key if desired.
|
||||||
virtual void StartingKey(wxKeyEvent& event);
|
virtual void StartingKey(wxKeyEvent& event);
|
||||||
|
|
||||||
|
// if the editor is enabled by clicking on the cell, this method will be
|
||||||
|
// called
|
||||||
|
virtual void StartingClick();
|
||||||
|
|
||||||
// Some types of controls on some platforms may need some help
|
// Some types of controls on some platforms may need some help
|
||||||
// with the Return key.
|
// with the Return key.
|
||||||
virtual void HandleReturn(wxKeyEvent& event);
|
virtual void HandleReturn(wxKeyEvent& event);
|
||||||
@@ -227,7 +231,7 @@ public:
|
|||||||
virtual bool EndEdit(int row, int col, bool saveValue, wxGrid* grid);
|
virtual bool EndEdit(int row, int col, bool saveValue, wxGrid* grid);
|
||||||
|
|
||||||
virtual void Reset();
|
virtual void Reset();
|
||||||
virtual void StartingKey(wxKeyEvent& event);
|
virtual void StartingClick();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxCheckBox *CBox() const { return (wxCheckBox *)m_control; }
|
wxCheckBox *CBox() const { return (wxCheckBox *)m_control; }
|
||||||
|
@@ -392,11 +392,11 @@ void wxGridCellEditor::HandleReturn(wxKeyEvent& event)
|
|||||||
|
|
||||||
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
|
void wxGridCellEditor::StartingKey(wxKeyEvent& event)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG(m_control,
|
event.Skip();
|
||||||
wxT("The wxGridCellEditor must be Created first!"));
|
}
|
||||||
|
|
||||||
// pass the event to the control
|
void wxGridCellEditor::StartingClick()
|
||||||
m_control->GetEventHandler()->ProcessEvent(event);
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -590,9 +590,9 @@ void wxGridCellBoolEditor::Reset()
|
|||||||
CBox()->SetValue(m_startValue);
|
CBox()->SetValue(m_startValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGridCellBoolEditor::StartingKey(wxKeyEvent& event)
|
void wxGridCellBoolEditor::StartingClick()
|
||||||
{
|
{
|
||||||
event.Skip();
|
CBox()->SetValue(!CBox()->GetValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -3179,6 +3179,11 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
|
|||||||
CanEnableCellControl())
|
CanEnableCellControl())
|
||||||
{
|
{
|
||||||
EnableCellEditControl();
|
EnableCellEditControl();
|
||||||
|
|
||||||
|
wxGridCellAttr* attr = GetCellAttr(m_currentCellCoords);
|
||||||
|
attr->GetEditor()->StartingClick();
|
||||||
|
attr->DecRef();
|
||||||
|
|
||||||
m_waitForSlowClick = FALSE;
|
m_waitForSlowClick = FALSE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user