More understandable symbolic constants in generic wxDVC's DoJob class.

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 664a282443980cdb27da145234418815d7e9386b..d87d766a079a8affe176011602cba556944b93b7 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -81,11 +81,12 @@ private:
 // event tables and such
 // ----------------------------------------------------------------------------
 
 // event tables and such
 // ----------------------------------------------------------------------------
 

-wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent )
-wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent )
-wxDEFINE_EVENT( wxEVT_WIZARD_CANCEL, wxWizardEvent )
-wxDEFINE_EVENT( wxEVT_WIZARD_FINISHED, wxWizardEvent )
-wxDEFINE_EVENT( wxEVT_WIZARD_HELP, wxWizardEvent )
+wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGED, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_CHANGING, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_CANCEL, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_FINISHED, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_HELP, wxWizardEvent );
+wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_SHOWN, wxWizardEvent );

 
 BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel)
 
 BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel)


@@ -214,11 +215,6 @@ wxSize wxWizardSizer::CalcMin()
 
 wxSize wxWizardSizer::GetMaxChildSize()
 {
 
 wxSize wxWizardSizer::GetMaxChildSize()
 {

-#if !defined(__WXDEBUG__)
-    if ( m_childSize.IsFullySpecified() )
-        return m_childSize;
-#endif
-

     wxSize maxOfMin;
 
     for ( wxSizerItemList::compatibility_iterator childNode = m_children.GetFirst();
     wxSize maxOfMin;
 
     for ( wxSizerItemList::compatibility_iterator childNode = m_children.GetFirst();


@@ -230,21 +226,6 @@ wxSize wxWizardSizer::GetMaxChildSize()
         maxOfMin.IncTo(SiblingSize(child));
     }
 
         maxOfMin.IncTo(SiblingSize(child));
     }
 

-    // No longer applicable since we may change sizes when size adaptation is done
-#if 0
-#ifdef __WXDEBUG__
-    if ( m_childSize.IsFullySpecified() && m_childSize != maxOfMin )
-    {
-        wxFAIL_MSG( _T("Size changed in wxWizard::GetPageAreaSizer()")
-                    _T("after RunWizard().\n")
-                    _T("Did you forget to call GetSizer()->Fit(this) ")
-                    _T("for some page?")) ;
-
-        return m_childSize;
-    }
-#endif // __WXDEBUG__
-#endif
-

     if ( m_owner->m_started )
     {
         m_childSize = maxOfMin;
     if ( m_owner->m_started )
     {
         m_childSize = maxOfMin;


@@ -335,7 +316,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
     mainColumn->Add(
         m_sizerBmpAndPage,
         1, // Vertically stretchable
     mainColumn->Add(
         m_sizerBmpAndPage,
         1, // Vertically stretchable

-        wxEXPAND // Horizonal stretching, no border
+        wxEXPAND // Horizontal stretching, no border

     );
     mainColumn->Add(0,5,
         0, // No vertical stretching
     );
     mainColumn->Add(0,5,
         0, // No vertical stretching


@@ -343,7 +324,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
     );
 
 #if wxUSE_STATBMP
     );
 
 #if wxUSE_STATBMP

-    if ( m_bitmap.Ok() )
+    if ( m_bitmap.IsOk() )

     {
         wxSize bitmapSize(wxDefaultSize);
         if (GetBitmapPlacement())
     {
         wxSize bitmapSize(wxDefaultSize);
         if (GetBitmapPlacement())


@@ -389,15 +370,8 @@ void wxWizard::AddStaticLine(wxBoxSizer *mainColumn)
 void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow)
 {
     wxASSERT_MSG( m_btnNext && m_btnPrev,
 void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow)
 {
     wxASSERT_MSG( m_btnNext && m_btnPrev,

-                  _T("You must create the buttons before calling ")
-                  _T("wxWizard::AddBackNextPair") );
-
-    // margin between Back and Next buttons
-#ifdef __WXMAC__
-    static const int BACKNEXT_MARGIN = 10;
-#else
-    static const int BACKNEXT_MARGIN = 0;
-#endif
+                  wxT("You must create the buttons before calling ")
+                  wxT("wxWizard::AddBackNextPair") );

 
     wxBoxSizer *backNextPair = new wxBoxSizer(wxHORIZONTAL);
     buttonRow->Add(
 
     wxBoxSizer *backNextPair = new wxBoxSizer(wxHORIZONTAL);
     buttonRow->Add(


@@ -408,7 +382,7 @@ void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow)
     );
 
     backNextPair->Add(m_btnPrev);
     );
 
     backNextPair->Add(m_btnPrev);

-    backNextPair->Add(BACKNEXT_MARGIN,0,
+    backNextPair->Add(10, 0,

         0, // No horizontal stretching
         wxEXPAND // No border, (mostly useless) vertical stretching
     );
         0, // No horizontal stretching
         wxEXPAND // No border, (mostly useless) vertical stretching
     );


@@ -451,7 +425,7 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn)
     wxButton *btnHelp=0;
 #ifdef __WXMAC__
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
     wxButton *btnHelp=0;
 #ifdef __WXMAC__
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)

-        btnHelp=new wxButton(this, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, buttonStyle);
+        btnHelp=new wxButton(this, wxID_HELP, wxEmptyString, wxDefaultPosition, wxDefaultSize, buttonStyle);

 #endif
 
     m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"));
 #endif
 
     m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"));


@@ -582,11 +556,8 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
             m_sizerBmpAndPage->Detach(m_page);
     }
 
             m_sizerBmpAndPage->Detach(m_page);
     }
 

-    // set the new page
-    m_page = page;
-

     // is this the end?
     // is this the end?

-    if ( !m_page )
+    if ( !page )

     {
         // terminate successfully
         if ( IsModal() )
     {
         // terminate successfully
         if ( IsModal() )


@@ -601,12 +572,18 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
         // and notify the user code (this is especially useful for modeless
         // wizards)
 
         // and notify the user code (this is especially useful for modeless
         // wizards)

-        wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, 0);
+        wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, m_page);

         (void)GetEventHandler()->ProcessEvent(event);
 
         (void)GetEventHandler()->ProcessEvent(event);
 

+        m_page = NULL;
+

         return true;
     }
 
         return true;
     }
 

+    // notice that we change m_page only here so that wxEVT_WIZARD_FINISHED
+    // event above could still use the correct (i.e. old) value of m_page
+    m_page = page;
+

     // position and show the new page
     (void)m_page->TransferDataToWindow();
 
     // position and show the new page
     (void)m_page->TransferDataToWindow();
 


@@ -627,10 +604,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     if ( m_statbmp )
     {
         bmp = m_page->GetBitmap();
     if ( m_statbmp )
     {
         bmp = m_page->GetBitmap();

-        if ( !bmp.Ok() )
+        if ( !bmp.IsOk() )

             bmp = m_bitmap;
 
             bmp = m_bitmap;
 

-        if ( !bmpPrev.Ok() )
+        if ( !bmpPrev.IsOk() )

             bmpPrev = m_bitmap;
 
         if (!GetBitmapPlacement())
             bmpPrev = m_bitmap;
 
         if (!GetBitmapPlacement())


@@ -682,6 +659,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
             m_sizerPage->RecalcSizes();
     }
 
             m_sizerPage->RecalcSizes();
     }
 

+    wxWizardEvent pageShownEvent(wxEVT_WIZARD_PAGE_SHOWN, GetId(),
+        goingForward, m_page);
+    m_page->GetEventHandler()->ProcessEvent(pageShownEvent);
+

     return true;
 }
 
     return true;
 }
 


@@ -798,7 +779,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event)
                   (event.GetEventObject() == m_btnPrev),
                   wxT("unknown button") );
 
                   (event.GetEventObject() == m_btnPrev),
                   wxT("unknown button") );
 

-    wxCHECK_RET( m_page, _T("should have a valid current page") );
+    wxCHECK_RET( m_page, wxT("should have a valid current page") );

 
     // ask the current page first: notice that we do it before calling
     // GetNext/Prev() because the data transfered from the controls of the page
 
     // ask the current page first: notice that we do it before calling
     // GetNext/Prev() because the data transfered from the controls of the page


@@ -936,7 +917,7 @@ bool wxWizard::DoLayoutAdaptation()
 
     // Size event doesn't get sent soon enough on wxGTK
     DoLayout();
 
     // Size event doesn't get sent soon enough on wxGTK
     DoLayout();

-    
+

     SetLayoutAdaptationDone(true);
 
     return true;
     SetLayoutAdaptationDone(true);
 
     return true;


@@ -947,7 +928,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp)
     if (!GetBitmapPlacement())
         return false;
 
     if (!GetBitmapPlacement())
         return false;
 

-    if (bmp.Ok())
+    if (bmp.IsOk())

     {
         wxSize pageSize = m_sizerPage->GetSize();
         if (pageSize == wxSize(0,0))
     {
         wxSize pageSize = m_sizerPage->GetSize();
         if (pageSize == wxSize(0,0))


@@ -955,7 +936,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp)
         int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth());
         int bitmapHeight = pageSize.y;
 
         int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth());
         int bitmapHeight = pageSize.y;
 

-        if (!m_statbmp->GetBitmap().Ok() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight)
+        if (!m_statbmp->GetBitmap().IsOk() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight)

         {
             wxBitmap bitmap(bitmapWidth, bitmapHeight);
             {
         {
             wxBitmap bitmap(bitmapWidth, bitmapHeight);
             {