From 7e14b6e61fa59c9415d5f0ca68620a4acb480296 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Tue, 26 May 2015 21:09:30 +0200
Subject: [PATCH] Fixed setting validation flags in the editor validation
 function (wxPropertyGrid::DoEditorValidate).

Currently, validation flags are initialized when post-process validation is invoked (in wxPropertyGrid::PerformValidation) and when first editing operation fails earlier on the pre-process validation (in wxPropertyGrid::DoEditorValidate) then these flags are not initialized and no validation error message is displayed.
Hence validation flags should be initialized in both validation functions.
---
 src/propgrid/propgrid.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 5ce1fcbc8a..64faa5ed2b 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3528,6 +3528,9 @@ bool wxPropertyGrid::DoEditorValidate()
     if ( guard.IsInside() )
         return false;
 
+    m_validationInfo.m_failureBehavior = m_permanentValidationFailureBehavior;
+    m_validationInfo.m_isFailing = true;
+
     wxPGProperty* selected = GetSelection();
     if ( selected )
     {
@@ -3541,6 +3544,8 @@ bool wxPropertyGrid::DoEditorValidate()
                 return false;
         }
     }
+
+    m_validationInfo.m_isFailing = false;
 #endif
     return true;
 }