X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96f4ca42017cf0cbf492dc1c7a1599c348a1901a..910426ee7bbd9f5959b4d5d075b35f0e8e3b52a9:/src/generic/wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 83ad8ffb49..91a35840b3 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -448,7 +448,7 @@ wxSize wxWizard::GetPageSize() const
     return wxSize(m_width, m_height);
 }
 
-void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(event))
+void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(eventUnused))
 {
     // this function probably can never be called when we don't have an active
     // page, but a small extra check won't hurt
@@ -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;