X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2365e5cbcf5bffc6d1ffb363b187455e8f093445..7843d11bdca4860661bdb9b571373706c9f02456:/src/generic/wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 3b368af84a..91a35840b3 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -9,7 +9,7 @@
 // Created:     15.08.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -44,12 +44,6 @@
 
 #include "wx/wizard.h"
 
-// ----------------------------------------------------------------------------
-// simple types
-// ----------------------------------------------------------------------------
-
-WX_DEFINE_ARRAY(wxPanel *, wxArrayPages);
-
 // ----------------------------------------------------------------------------
 // event tables and such
 // ----------------------------------------------------------------------------
@@ -57,6 +51,7 @@ WX_DEFINE_ARRAY(wxPanel *, wxArrayPages);
 DEFINE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_WIZARD_PAGE_CHANGING)
 DEFINE_EVENT_TYPE(wxEVT_WIZARD_CANCEL)
+DEFINE_EVENT_TYPE(wxEVT_WIZARD_FINISHED)
 DEFINE_EVENT_TYPE(wxEVT_WIZARD_HELP)
 
 BEGIN_EVENT_TABLE(wxWizard, wxDialog)
@@ -68,6 +63,7 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_WIZARD_PAGE_CHANGED(-1, wxWizard::OnWizEvent)
     EVT_WIZARD_PAGE_CHANGING(-1, wxWizard::OnWizEvent)
     EVT_WIZARD_CANCEL(-1, wxWizard::OnWizEvent)
+    EVT_WIZARD_FINISHED(-1, wxWizard::OnWizEvent)
     EVT_WIZARD_HELP(-1, wxWizard::OnWizEvent)
 END_EVENT_TABLE()
 
@@ -106,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
     }
 
@@ -190,6 +188,13 @@ void wxWizard::DoCreateControls()
     // margin between "Next >" and "Cancel" buttons
     static const int BUTTON_MARGIN = 10;
 
+    // margin between Back and Next buttons
+#ifdef __WXMAC__
+    static const int BACKNEXT_MARGIN = 10;
+#else
+    static const int BACKNEXT_MARGIN = 0;
+#endif
+
     // default width and height of the page
     static const int DEFAULT_PAGE_WIDTH = 270;
     static const int DEFAULT_PAGE_HEIGHT = 290;
@@ -238,7 +243,7 @@ void wxWizard::DoCreateControls()
                            wxSize(m_x + m_width - x, 2));
 #endif // wxUSE_STATLINE
 
-    x = m_x + m_width - 3*sizeBtn.x - BUTTON_MARGIN;
+    x = m_x + m_width - 3*sizeBtn.x - BUTTON_MARGIN - BACKNEXT_MARGIN;
     y += SEPARATOR_LINE_MARGIN;
 
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
@@ -254,6 +259,8 @@ void wxWizard::DoCreateControls()
     m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"), wxPoint(x, y), sizeBtn);
 
     x += sizeBtn.x;
+    x += BACKNEXT_MARGIN;
+
     m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"), wxPoint(x, y), sizeBtn);
 
     x += sizeBtn.x + BUTTON_MARGIN;
@@ -339,7 +346,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
         m_page->Hide();
 
-        btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;
+        btnLabelWasNext = HasNextPage(m_page);
 
         // Get the bitmap of the previous page (if it exists)
         if ( m_page->GetBitmap().Ok() )
@@ -356,6 +363,11 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     {
         // terminate successfully
         EndModal(wxID_OK);
+        if ( !IsModal() )
+         {
+           wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(),FALSE, 0);
+           (void)GetEventHandler()->ProcessEvent(event);
+         }
         return TRUE;
     }
 
@@ -386,9 +398,9 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     }
 
     // and update the buttons state
-    m_btnPrev->Enable(m_page->GetPrev() != (wxWizardPage *)NULL);
+    m_btnPrev->Enable(HasPrevPage(m_page));
 
-    bool hasNext = m_page->GetNext() != (wxWizardPage *)NULL;
+    bool hasNext = HasNextPage(m_page);
     if ( btnLabelWasNext != hasNext )
     {
         // need to update
@@ -436,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
@@ -460,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;
@@ -520,6 +532,8 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
 // our public interface
 // ----------------------------------------------------------------------------
 
+#ifdef WXWIN_COMPATIBILITY_2_2
+
 /* static */
 wxWizard *wxWizardBase::Create(wxWindow *parent,
                                int id,
@@ -531,6 +545,8 @@ wxWizard *wxWizardBase::Create(wxWindow *parent,
     return new wxWizard(parent, id, title, bitmap, pos);
 }
 
+#endif // WXWIN_COMPATIBILITY_2_2
+
 // ----------------------------------------------------------------------------
 // wxWizardEvent
 // ----------------------------------------------------------------------------