Changeset 56169 for wxWidgets/trunk/src/propgrid/props.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/src/propgrid/props.cpp (modified) (4 diffs)

wxWidgets/trunk/src/propgrid/props.cpp

@@ -1559 +1559 @@
 {
     // Update property value from editor, if necessary
-    PrepareValueForDialogEditing(propGrid);
-
     wxSize dlg_sz(300,400);
 
@@ -1888 +1886 @@
     {
         // Update the value
-        PrepareValueForDialogEditing(propGrid);
-
-        wxString val1 = GetValueAsString(0);
+        wxVariant useValue = propGrid->GetPendingEditedValue();
+
+        wxString val1 = useValue.GetString();
         wxString val_orig = val1;
 
@@ -2490 +2488 @@
 {
     // Update the value
-    PrepareValueForDialogEditing(propGrid);
+    wxVariant useValue = propGrid->GetPendingEditedValue();
 
     if ( !propGrid->EditorValidate() )
@@ -2507 +2505 @@
         strEdDlg->SetCustomButton(cbt, this);
 
-    dlg->SetDialogValue( wxVariant(m_value) );
+    dlg->SetDialogValue( useValue );
     dlg->Create(propGrid, wxEmptyString, m_label);