Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed saveValue param in EndEdit()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-02-23 15:58:10 +00:00
parent 8def743e8f
commit 3324d5f50f
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,11 +260,9 @@ public:
// to begin editing. Set the focus to the edit control. // to begin editing. Set the focus to the edit control.
virtual void BeginEdit(int row, int col, wxGrid* grid) = 0; virtual void BeginEdit(int row, int col, wxGrid* grid) = 0;
// Complete the editing of the current cell. If saveValue is // Complete the editing of the current cell. Returns true if the value has
// true then send the new value back to the table. Returns true // changed. If necessary, the control may be destroyed.
// if the value has changed. If necessary, the control may be virtual bool EndEdit(int row, int col, wxGrid* grid) = 0;
// destroyed.
virtual bool EndEdit(int row, int col, bool saveValue, wxGrid* grid) = 0;
// Reset the value in the control back to its starting value // Reset the value in the control back to its starting value
virtual void Reset() = 0; virtual void Reset() = 0;
@@ -311,7 +309,7 @@ public:
virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr); virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
virtual void BeginEdit(int row, int col, wxGrid* grid); virtual void BeginEdit(int row, int col, wxGrid* grid);
virtual bool EndEdit(int row, int col, bool saveValue, wxGrid* grid); virtual bool EndEdit(int row, int col, wxGrid* grid);
virtual void Reset(); virtual void Reset();
virtual void StartingKey(wxKeyEvent& event); virtual void StartingKey(wxKeyEvent& event);
@@ -341,7 +339,7 @@ public:
wxEvtHandler* evtHandler); wxEvtHandler* evtHandler);
virtual void BeginEdit(int row, int col, wxGrid* grid); virtual void BeginEdit(int row, int col, wxGrid* grid);
virtual bool EndEdit(int row, int col, bool saveValue, wxGrid* grid); virtual bool EndEdit(int row, int col, wxGrid* grid);
virtual void Reset(); virtual void Reset();
virtual void StartingKey(wxKeyEvent& event); virtual void StartingKey(wxKeyEvent& event);
@@ -372,7 +370,7 @@ public:
wxEvtHandler* evtHandler); wxEvtHandler* evtHandler);
virtual void BeginEdit(int row, int col, wxGrid* grid); virtual void BeginEdit(int row, int col, wxGrid* grid);
virtual bool EndEdit(int row, int col, bool saveValue, wxGrid* grid); virtual bool EndEdit(int row, int col, wxGrid* grid);
virtual void Reset(); virtual void Reset();
virtual void StartingKey(wxKeyEvent& event); virtual void StartingKey(wxKeyEvent& event);
@@ -398,7 +396,7 @@ public:
virtual void Show(bool show, wxGridCellAttr *attr = (wxGridCellAttr *)NULL); virtual void Show(bool show, wxGridCellAttr *attr = (wxGridCellAttr *)NULL);
virtual void BeginEdit(int row, int col, wxGrid* grid); virtual void BeginEdit(int row, int col, wxGrid* grid);
virtual bool EndEdit(int row, int col, bool saveValue, wxGrid* grid); virtual bool EndEdit(int row, int col, wxGrid* grid);
virtual void Reset(); virtual void Reset();
virtual void StartingClick(); virtual void StartingClick();
@@ -425,7 +423,7 @@ public:
virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr); virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
virtual void BeginEdit(int row, int col, wxGrid* grid); virtual void BeginEdit(int row, int col, wxGrid* grid);
virtual bool EndEdit(int row, int col, bool saveValue, wxGrid* grid); virtual bool EndEdit(int row, int col, wxGrid* grid);
virtual void Reset(); virtual void Reset();

10
src/generic/grid.cpp
View File

@@ -513,7 +513,7 @@ void wxGridCellTextEditor::DoBeginEdit(const wxString& startValue)
Text()->SetFocus(); Text()->SetFocus();
} }
bool wxGridCellTextEditor::EndEdit(int row, int col, bool saveValue, bool wxGridCellTextEditor::EndEdit(int row, int col,
wxGrid* grid) wxGrid* grid)
{ {
wxASSERT_MSG(m_control, wxASSERT_MSG(m_control,
@@ -648,7 +648,7 @@ void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
} }
} }
bool wxGridCellNumberEditor::EndEdit(int row, int col, bool saveValue, bool wxGridCellNumberEditor::EndEdit(int row, int col,
wxGrid* grid) wxGrid* grid)
{ {
bool changed; bool changed;
@@ -733,7 +733,7 @@ void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
DoBeginEdit(GetString()); DoBeginEdit(GetString());
} }
bool wxGridCellFloatEditor::EndEdit(int row, int col, bool saveValue, bool wxGridCellFloatEditor::EndEdit(int row, int col,
wxGrid* grid) wxGrid* grid)
{ {
double value; double value;
@@ -824,7 +824,6 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
} }
bool wxGridCellBoolEditor::EndEdit(int row, int col, bool wxGridCellBoolEditor::EndEdit(int row, int col,
bool saveValue,
wxGrid* grid) wxGrid* grid)
{ {
wxASSERT_MSG(m_control, wxASSERT_MSG(m_control,
@@ -925,7 +924,6 @@ void wxGridCellChoiceEditor::BeginEdit(int row, int col, wxGrid* grid)
} }
bool wxGridCellChoiceEditor::EndEdit(int row, int col, bool wxGridCellChoiceEditor::EndEdit(int row, int col,
bool saveValue,
wxGrid* grid) wxGrid* grid)
{ {
wxString value = Combo()->GetValue(); wxString value = Combo()->GetValue();
@@ -5411,7 +5409,7 @@ void wxGrid::SaveEditControlValue()
wxGridCellAttr* attr = GetCellAttr(row, col); wxGridCellAttr* attr = GetCellAttr(row, col);
wxGridCellEditor* editor = attr->GetEditor(this, row, col); wxGridCellEditor* editor = attr->GetEditor(this, row, col);
bool changed = editor->EndEdit(row, col, TRUE, this); bool changed = editor->EndEdit(row, col, this);
attr->DecRef(); attr->DecRef();