]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/wizard.cpp
no real change; just add the standard separator where it's missing
[wxWidgets.git] / src / generic / wizard.cpp
index 664a282443980cdb27da145234418815d7e9386b..1ad3a17c6fac4f73ee9ad7861c0b8e2d3ea14b2d 100644 (file)
@@ -81,11 +81,11 @@ private:
 // 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 );
 
 BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel)
@@ -214,11 +214,6 @@ wxSize wxWizardSizer::CalcMin()
 
 wxSize wxWizardSizer::GetMaxChildSize()
 {
-#if !defined(__WXDEBUG__)
-    if ( m_childSize.IsFullySpecified() )
-        return m_childSize;
-#endif
-
     wxSize maxOfMin;
 
     for ( wxSizerItemList::compatibility_iterator childNode = m_children.GetFirst();
@@ -230,21 +225,6 @@ wxSize wxWizardSizer::GetMaxChildSize()
         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;