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
This commit is contained in:
Julian Smart
2003-05-16 21:21:53 +00:00
parent cfb00da4c4
commit ba8c70bb2e
2 changed files with 3 additions and 1 deletions

View File

@@ -81,6 +81,8 @@ All GUI ports:
default extension for the template default extension for the template
- Speeded up wxImage::Scale using fixed point arithmetic (Wade Brainerd) - Speeded up wxImage::Scale using fixed point arithmetic (Wade Brainerd)
- Added BLOB support to wxDB (John Skiff) - Added BLOB support to wxDB (John Skiff)
- Wizard now validates as well as doing data transfer when
pressing Back or Next
Unix: Unix:

View File

@@ -472,7 +472,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event)
// ask the current page first: notice that we do it before calling // ask the current page first: notice that we do it before calling
// GetNext/Prev() because the data transfered from the controls of the page // GetNext/Prev() because the data transfered from the controls of the page
// may change the value returned by these methods // 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 // the page data is incorrect, don't do anything
return; return;