X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7de4135b619a045593a42dcbb1d1e8a7858cdcc..7ed2b47bf5c96d3da2b28543d5a7aec3d7197959:/src/generic/wizard.cpp

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 3d1654bef7..01304347cf 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation ".h"
+    #pragma implementation "wizardg.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -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)
@@ -64,6 +59,12 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_HELP, wxWizard::OnHelp)
+
+    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()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
@@ -90,7 +91,7 @@ wxWizardPage::wxWizardPage(wxWizard *parent,
 {
     Create(parent, bitmap, resource);
 }
-    
+
 bool wxWizardPage::Create(wxWizard *parent,
                           const wxBitmap& bitmap,
                           const wxChar *resource)
@@ -112,7 +113,7 @@ bool wxWizardPage::Create(wxWizard *parent,
 
     // initially the page is hidden, it's shown only when it becomes current
     Hide();
-    
+
     return TRUE;
 }
 
@@ -185,6 +186,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;
@@ -233,7 +241,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)
@@ -249,6 +257,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;
@@ -275,6 +285,32 @@ void wxWizard::SetPageSize(const wxSize& size)
     m_sizePage = size;
 }
 
+void wxWizard::FitToPage(const wxWizardPage *page)
+{
+    // otherwise it will have no effect now as it's too late...
+    wxASSERT_MSG( !WasCreated(), _T("should be called before RunWizard()!") );
+
+    wxSize sizeMax;
+    while ( page )
+    {
+        wxSize size = page->GetBestSize();
+
+        if ( size.x > sizeMax.x )
+            sizeMax.x = size.x;
+
+        if ( size.y > sizeMax.y )
+            sizeMax.y = size.y;
+
+        page = page->GetNext();
+    }
+
+    if ( sizeMax.x > m_sizePage.x )
+        m_sizePage.x = sizeMax.x;
+
+    if ( sizeMax.y > m_sizePage.y )
+        m_sizePage.y = sizeMax.y;
+}
+
 bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 {
     wxASSERT_MSG( page != m_page, wxT("this is useless") );
@@ -292,14 +328,13 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
     // use these labels to determine if we need to change the bitmap
     // for this page
-    wxBitmap   PreviousBitmap = wxNullBitmap;
-    wxBitmap   ThisBitmap = wxNullBitmap;
+    wxBitmap bmpPrev, bmpCur;
 
     // check for previous page
     if ( m_page )
     {
         // send the event to the old page
-        wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGING, GetId(), goingForward);
+        wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGING, GetId(), goingForward, m_page);
         if ( m_page->GetEventHandler()->ProcessEvent(event) &&
              !event.IsAllowed() )
         {
@@ -309,12 +344,12 @@ 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())
-    {
-            PreviousBitmap = m_page->GetBitmap();
+        if ( m_page->GetBitmap().Ok() )
+        {
+            bmpPrev = m_page->GetBitmap();
         }
     }
 
@@ -326,23 +361,23 @@ 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;
     }
 
-    // send the change event to the new page now
-    wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward);
-    (void)m_page->GetEventHandler()->ProcessEvent(event);
-
     // position and show the new page
     (void)m_page->TransferDataToWindow();
     m_page->SetSize(m_x, m_y, m_width, m_height);
-    m_page->Show();
 
     // check if bitmap needs to be updated
     // update default flag as well
-    if(m_page->GetBitmap().Ok())
+    if ( m_page->GetBitmap().Ok() )
     {
-        ThisBitmap = m_page->GetBitmap();
+        bmpCur = m_page->GetBitmap();
         bmpIsDefault = FALSE;
     }
 
@@ -350,7 +385,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     // 1) a default bitmap was selected in constructor
     // 2) this page was constructed with a bitmap
     // 3) this bitmap is not the previous bitmap
-    if( m_statbmp && (ThisBitmap != PreviousBitmap) )
+    if ( m_statbmp && (bmpCur != bmpPrev) )
     {
         wxBitmap bmp;
         if ( bmpIsDefault )
@@ -361,9 +396,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
@@ -374,6 +409,14 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     }
     // nothing to do: the label was already correct
 
+    // send the change event to the new page now
+    wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward, m_page);
+    (void)m_page->GetEventHandler()->ProcessEvent(event);
+
+    // and finally show it
+    m_page->Show();
+    m_page->SetFocus();
+
     return TRUE;
 }
 
@@ -409,7 +452,7 @@ void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(event))
     // page, but a small extra check won't hurt
     wxWindow *win = m_page ? (wxWindow *)m_page : (wxWindow *)this;
 
-    wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId());
+    wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId(), FALSE, m_page);
     if ( !win->GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
     {
         // no objections - close the dialog
@@ -465,11 +508,30 @@ void wxWizard::OnHelp(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+void wxWizard::OnWizEvent(wxWizardEvent& event)
+{
+    // the dialogs have wxWS_EX_BLOCK_EVENTS style on by default but we want to
+    // propagate wxEVT_WIZARD_XXX to the parent (if any), so do it manually
+    if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
+    {
+        // the event will be propagated anyhow
+        return;
+    }
+
+    wxWindow *parent = GetParent();
+
+    if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) )
+    {
+        event.Skip();
+    }
+}
 
 // ----------------------------------------------------------------------------
 // our public interface
 // ----------------------------------------------------------------------------
 
+#ifdef WXWIN_COMPATIBILITY_2_2
+
 /* static */
 wxWizard *wxWizardBase::Create(wxWindow *parent,
                                int id,
@@ -481,6 +543,8 @@ wxWizard *wxWizardBase::Create(wxWindow *parent,
     return new wxWizard(parent, id, title, bitmap, pos);
 }
 
+#endif // WXWIN_COMPATIBILITY_2_2
+
 // ----------------------------------------------------------------------------
 // wxWizardEvent
 // ----------------------------------------------------------------------------