pc 2 mac conversion for file operations

[wxWidgets.git] / src / generic / wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 6187785c05493539c4683d8c30a032c2418952f8..91a35840b35cfd0e10e48faef3b159949bec0213 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -102,10 +102,12 @@ bool wxWizardPage::Create(wxWizard *parent,
     if ( resource != NULL )
     {
 #if wxUSE_WX_RESOURCES
-        if ( !LoadFromResource(this, resource) )
+#if 0
+       if ( !LoadFromResource(this, resource) )
         {
             wxFAIL_MSG(wxT("wxWizardPage LoadFromResource failed!!!!"));
         }
+#endif
 #endif // wxUSE_RESOURCES
     }
 
@@ -446,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
@@ -470,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;