From 703ee9f5eccb0a002c02b60d87f239a2b6529e1e Mon Sep 17 00:00:00 2001
From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Fri, 10 Oct 2008 15:22:08 +0000
Subject: [PATCH] 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
---
 include/wx/propgrid/propgrid.h   | 2 +-
 interface/wx/propgrid/propgrid.h | 2 +-
 samples/propgrid/sampleprops.cpp | 4 ++--
 src/propgrid/advprops.cpp        | 4 ++--
 src/propgrid/propgrid.cpp        | 2 +-
 src/propgrid/props.cpp           | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 7140e61bcf..809b849a4e 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -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;
diff --git a/interface/wx/propgrid/propgrid.h b/interface/wx/propgrid/propgrid.h
index bcbf41ac7d..5866eba44b 100644
--- a/interface/wx/propgrid/propgrid.h
+++ b/interface/wx/propgrid/propgrid.h
@@ -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.
diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp
index 21303e7af4..142771bd11 100644
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -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);
 
diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index f50ce38f49..cea3701351 100644
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -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;
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 0ec16d26c2..021f77cd5f 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3104,7 +3104,7 @@ bool wxPropertyGrid::ChangePropertyValue( wxPGPropArg id, wxVariant newValue )
 
 // -----------------------------------------------------------------------
 
-wxVariant wxPropertyGrid::GetPendingEditedValue()
+wxVariant wxPropertyGrid::GetUncommittedPropertyValue()
 {
     wxPGProperty* prop = GetSelectedProperty();
 
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index a411916687..2d2890df73 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -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;
-- 
2.45.2