GetPendingEditedValue() -> GetUncommittedPropertyValue() (more consistent API naming...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 7140e61bcf257d00b5fc5b7c274098049a5fbc1b..809b849a4e5ebfa0be8bcfc1d0ccd2ebdef4ae6e 100644 (file)
--- 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.
     */
         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;
 
     /** 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 bcbf41ac7d5acaece611eb9165ae2376a7d31a4c..5866eba44bed4f1957ac3d5a8c248fcf137673b5 100644 (file)
--- 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.
     */
         editor is activate and string edited by user represents valid,
         uncommitted property value.
     */

-    wxVariant GetPendingEditedValue();
+    wxVariant GetUncommittedPropertyValue();

 
     /**
         Returns cell background colour of a property.
 
     /**
         Returns cell background colour of a property.

diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp
index 21303e7af44252cd8c644b6eb4bc10d66476b054..142771bd11c5d2768cbc07331e68ce66b1eaa875 100644 (file)
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -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;
         fontData << useValue;
 
         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
     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);
 
 
         wxArrayDouble& value = wxArrayDoubleRefFromVariant(useValue);
 

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index f50ce38f493226f73c85119be25987122c556d2f..cea3701351f2f1cbea221c1055204ff58827285a 100644 (file)
--- 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
     if ( propgrid->IsMainButtonEvent(event) )
     {
         // Update value from last minute changes

-        wxVariant useValue = propgrid->GetPendingEditedValue();
+        wxVariant useValue = propgrid->GetUncommittedPropertyValue();

 
         wxFontData data;
         wxFont font;
 
         wxFontData data;
         wxFont font;


@@ -1803,7 +1803,7 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
     if ( propgrid->IsMainButtonEvent(event) )
     {
         // Update the value
     if ( propgrid->IsMainButtonEvent(event) )
     {
         // Update the value

-        wxVariant useValue = propgrid->GetPendingEditedValue();
+        wxVariant useValue = propgrid->GetUncommittedPropertyValue();

 
         wxArrayString labels = m_choices.GetLabels();
         unsigned int choiceCount;
 
         wxArrayString labels = m_choices.GetLabels();
         unsigned int choiceCount;

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 0ec16d26c292ff6e110f8d2fedf825d212df0355..021f77cd5f859536f89077d2ced4eb78b48b0253 100644 (file)
--- 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();
 
 {
     wxPGProperty* prop = GetSelectedProperty();
 

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index a4119166876608456f2e95409892dfc777337453..2d2890df7302555907df26eacf21ff62dc033291 100644 (file)
--- 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
     if ( propGrid->IsMainButtonEvent(event) )
     {
         // Update the value

-        wxVariant useValue = propGrid->GetPendingEditedValue();
+        wxVariant useValue = propGrid->GetUncommittedPropertyValue();

 
         wxString val1 = useValue.GetString();
         wxString val_orig = val1;
 
         wxString val1 = useValue.GetString();
         wxString val_orig = val1;


@@ -2487,7 +2487,7 @@ bool wxArrayStringProperty::OnButtonClick( wxPropertyGrid* propGrid,
                                            const wxChar* cbt )
 {
     // Update the value
                                            const wxChar* cbt )
 {
     // Update the value

-    wxVariant useValue = propGrid->GetPendingEditedValue();
+    wxVariant useValue = propGrid->GetUncommittedPropertyValue();

 
     if ( !propGrid->EditorValidate() )
         return false;
 
     if ( !propGrid->EditorValidate() )
         return false;