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

GetPendingEditedValue() -> GetUncommittedPropertyValue() (more consistent API naming. Eg. there is also CommitChangesFromEditor())

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-10-10 15:22:08 +00:00
parent 236a34ef3e
commit 703ee9f5ec
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/propgrid/propgrid.h
View File

@@ -838,7 +838,7 @@ public:
editor is activate and string edited by user represents valid, editor is activate and string edited by user represents valid,
uncommitted property value. uncommitted property value.
*/ */
wxVariant GetPendingEditedValue(); wxVariant GetUncommittedPropertyValue();
/** Returns cell background colour of a property. */ /** Returns cell background colour of a property. */
wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const; wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const;

2
interface/wx/propgrid/propgrid.h
View File

@@ -592,7 +592,7 @@ public:
editor is activate and string edited by user represents valid, editor is activate and string edited by user represents valid,
uncommitted property value. uncommitted property value.
*/ */
wxVariant GetPendingEditedValue(); wxVariant GetUncommittedPropertyValue();
/** /**
Returns cell background colour of a property. Returns cell background colour of a property.

4
samples/propgrid/sampleprops.cpp
View File

@@ -131,7 +131,7 @@ bool wxFontDataProperty::OnEvent( wxPropertyGrid* propgrid,
{ {
if ( propgrid->IsMainButtonEvent(event) ) if ( propgrid->IsMainButtonEvent(event) )
{ {
wxVariant useValue = propgrid->GetPendingEditedValue(); wxVariant useValue = propgrid->GetUncommittedPropertyValue();
wxFontData fontData; wxFontData fontData;
fontData << useValue; fontData << useValue;
@@ -554,7 +554,7 @@ bool wxArrayDoubleProperty::OnEvent( wxPropertyGrid* propgrid,
if ( propgrid->IsMainButtonEvent(event) ) if ( propgrid->IsMainButtonEvent(event) )
{ {
// Update the value in case of last minute changes // Update the value in case of last minute changes
wxVariant useValue = propgrid->GetPendingEditedValue(); wxVariant useValue = propgrid->GetUncommittedPropertyValue();
wxArrayDouble& value = wxArrayDoubleRefFromVariant(useValue); wxArrayDouble& value = wxArrayDoubleRefFromVariant(useValue);

4
src/propgrid/advprops.cpp
View File

@@ -531,7 +531,7 @@ bool wxFontProperty::OnEvent( wxPropertyGrid* propgrid, wxWindow* WXUNUSED(prima
if ( propgrid->IsMainButtonEvent(event) ) if ( propgrid->IsMainButtonEvent(event) )
{ {
// Update value from last minute changes // Update value from last minute changes
wxVariant useValue = propgrid->GetPendingEditedValue(); wxVariant useValue = propgrid->GetUncommittedPropertyValue();
wxFontData data; wxFontData data;
wxFont font; wxFont font;
@@ -1803,7 +1803,7 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
if ( propgrid->IsMainButtonEvent(event) ) if ( propgrid->IsMainButtonEvent(event) )
{ {
// Update the value // Update the value
wxVariant useValue = propgrid->GetPendingEditedValue(); wxVariant useValue = propgrid->GetUncommittedPropertyValue();
wxArrayString labels = m_choices.GetLabels(); wxArrayString labels = m_choices.GetLabels();
unsigned int choiceCount; unsigned int choiceCount;

2
src/propgrid/propgrid.cpp
View File

@@ -3104,7 +3104,7 @@ bool wxPropertyGrid::ChangePropertyValue( wxPGPropArg id, wxVariant newValue )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
wxVariant wxPropertyGrid::GetPendingEditedValue() wxVariant wxPropertyGrid::GetUncommittedPropertyValue()
{ {
wxPGProperty* prop = GetSelectedProperty(); wxPGProperty* prop = GetSelectedProperty();

4
src/propgrid/props.cpp
View File

@@ -1885,7 +1885,7 @@ bool wxLongStringProperty::OnEvent( wxPropertyGrid* propGrid, wxWindow* WXUNUSED
if ( propGrid->IsMainButtonEvent(event) ) if ( propGrid->IsMainButtonEvent(event) )
{ {
// Update the value // Update the value
wxVariant useValue = propGrid->GetPendingEditedValue(); wxVariant useValue = propGrid->GetUncommittedPropertyValue();
wxString val1 = useValue.GetString(); wxString val1 = useValue.GetString();
wxString val_orig = val1; wxString val_orig = val1;
@@ -2487,7 +2487,7 @@ bool wxArrayStringProperty::OnButtonClick( wxPropertyGrid* propGrid,
const wxChar* cbt ) const wxChar* cbt )
{ {
// Update the value // Update the value
wxVariant useValue = propGrid->GetPendingEditedValue(); wxVariant useValue = propGrid->GetUncommittedPropertyValue();
if ( !propGrid->EditorValidate() ) if ( !propGrid->EditorValidate() )
return false; return false;