Changeset 56169 for wxWidgets/trunk/samples/propgrid/sampleprops.cpp

Timestamp:

10/08/08 11:15:10 (3 months ago)

Author:

JMS

Message:

Removed dysfunctional wxPGPropery::PrepareValueForDialogEditing(); Replaced its functionality with wxPropertyGrid::GetPendingEditedValue(); Added wxPropertyGrid::PerformValidation() flags so it can be called in generic context.

Files:

• wxWidgets/trunk/samples/propgrid/sampleprops.cpp (modified) (2 diffs)

wxWidgets/trunk/samples/propgrid/sampleprops.cpp

@@ -132 +132 @@
     if ( propgrid->IsMainButtonEvent(event) )
     {
-        // Update value from last minute changes
-        PrepareValueForDialogEditing(propgrid);
+        wxVariant useValue = propgrid->GetPendingEditedValue();
 
         wxFontData fontData;
-        fontData << m_value_wxFontData;
+        fontData << useValue;
 
         fontData.SetInitialFont(fontData.GetChosenFont());
@@ -555 +554 @@
     if ( propgrid->IsMainButtonEvent(event) )
     {
-        wxArrayDouble& value = wxArrayDoubleRefFromVariant(m_value);
-
         // Update the value in case of last minute changes
-        PrepareValueForDialogEditing(propgrid);
+        wxVariant useValue = propgrid->GetPendingEditedValue();
+
+        wxArrayDouble& value = wxArrayDoubleRefFromVariant(useValue);
 
         // Create editor dialog.