GetPendingEditedValue() -> GetUncommittedPropertyValue() (more consistent API naming. Eg. there is also CommitChangesFromEditor())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
236a34ef3e
commit
703ee9f5ec
6 changed files with 9 additions and 9 deletions
|
|
@ -838,7 +838,7 @@ public:
|
|||
editor is activate and string edited by user represents valid,
|
||||
uncommitted property value.
|
||||
*/
|
||||
wxVariant GetPendingEditedValue();
|
||||
wxVariant GetUncommittedPropertyValue();
|
||||
|
||||
/** Returns cell background colour of a property. */
|
||||
wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const;
|
||||
|
|
|
|||
|
|
@ -592,7 +592,7 @@ public:
|
|||
editor is activate and string edited by user represents valid,
|
||||
uncommitted property value.
|
||||
*/
|
||||
wxVariant GetPendingEditedValue();
|
||||
wxVariant GetUncommittedPropertyValue();
|
||||
|
||||
/**
|
||||
Returns cell background colour of a property.
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ bool wxFontDataProperty::OnEvent( wxPropertyGrid* propgrid,
|
|||
{
|
||||
if ( propgrid->IsMainButtonEvent(event) )
|
||||
{
|
||||
wxVariant useValue = propgrid->GetPendingEditedValue();
|
||||
wxVariant useValue = propgrid->GetUncommittedPropertyValue();
|
||||
|
||||
wxFontData fontData;
|
||||
fontData << useValue;
|
||||
|
|
@ -554,7 +554,7 @@ bool wxArrayDoubleProperty::OnEvent( wxPropertyGrid* propgrid,
|
|||
if ( propgrid->IsMainButtonEvent(event) )
|
||||
{
|
||||
// Update the value in case of last minute changes
|
||||
wxVariant useValue = propgrid->GetPendingEditedValue();
|
||||
wxVariant useValue = propgrid->GetUncommittedPropertyValue();
|
||||
|
||||
wxArrayDouble& value = wxArrayDoubleRefFromVariant(useValue);
|
||||
|
||||
|
|
|
|||
|
|
@ -531,7 +531,7 @@ bool wxFontProperty::OnEvent( wxPropertyGrid* propgrid, wxWindow* WXUNUSED(prima
|
|||
if ( propgrid->IsMainButtonEvent(event) )
|
||||
{
|
||||
// Update value from last minute changes
|
||||
wxVariant useValue = propgrid->GetPendingEditedValue();
|
||||
wxVariant useValue = propgrid->GetUncommittedPropertyValue();
|
||||
|
||||
wxFontData data;
|
||||
wxFont font;
|
||||
|
|
@ -1803,7 +1803,7 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
|
|||
if ( propgrid->IsMainButtonEvent(event) )
|
||||
{
|
||||
// Update the value
|
||||
wxVariant useValue = propgrid->GetPendingEditedValue();
|
||||
wxVariant useValue = propgrid->GetUncommittedPropertyValue();
|
||||
|
||||
wxArrayString labels = m_choices.GetLabels();
|
||||
unsigned int choiceCount;
|
||||
|
|
|
|||
|
|
@ -3104,7 +3104,7 @@ bool wxPropertyGrid::ChangePropertyValue( wxPGPropArg id, wxVariant newValue )
|
|||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
wxVariant wxPropertyGrid::GetPendingEditedValue()
|
||||
wxVariant wxPropertyGrid::GetUncommittedPropertyValue()
|
||||
{
|
||||
wxPGProperty* prop = GetSelectedProperty();
|
||||
|
||||
|
|
|
|||
|
|
@ -1885,7 +1885,7 @@ bool wxLongStringProperty::OnEvent( wxPropertyGrid* propGrid, wxWindow* WXUNUSED
|
|||
if ( propGrid->IsMainButtonEvent(event) )
|
||||
{
|
||||
// Update the value
|
||||
wxVariant useValue = propGrid->GetPendingEditedValue();
|
||||
wxVariant useValue = propGrid->GetUncommittedPropertyValue();
|
||||
|
||||
wxString val1 = useValue.GetString();
|
||||
wxString val_orig = val1;
|
||||
|
|
@ -2487,7 +2487,7 @@ bool wxArrayStringProperty::OnButtonClick( wxPropertyGrid* propGrid,
|
|||
const wxChar* cbt )
|
||||
{
|
||||
// Update the value
|
||||
wxVariant useValue = propGrid->GetPendingEditedValue();
|
||||
wxVariant useValue = propGrid->GetUncommittedPropertyValue();
|
||||
|
||||
if ( !propGrid->EditorValidate() )
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue