Wizard now validates as well as doing data transfer when

pressing Back or Next

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

diff --git a/docs/changes.txt b/docs/changes.txt
index d46885f33f48f083fa5030cca362f94afd310271..db8e9a67f406db709dc8f2c2f0f92fc5ac9fb26e 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -81,6 +81,8 @@ All GUI ports:
   default extension for the template
 - Speeded up wxImage::Scale using fixed point arithmetic (Wade Brainerd)
 - Added BLOB support to wxDB (John Skiff)
+- Wizard now validates as well as doing data transfer when
+  pressing Back or Next
 
 Unix:
 

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index fa333394811c24762fd4f2f14e7be24f267192a5..91a35840b35cfd0e10e48faef3b159949bec0213 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -472,7 +472,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event)
     // ask the current page first: notice that we do it before calling
     // GetNext/Prev() because the data transfered from the controls of the page
     // may change the value returned by these methods
-    if ( m_page && !m_page->TransferDataFromWindow() )
+    if ( m_page && (!m_page->Validate() || !m_page->TransferDataFromWindow()) )
     {
         // the page data is incorrect, don't do anything
         return;