Use our own getters and properties for wxVisualAttributes

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index b9e6ecae67613ac4aaf6a441610c8ee23ed876ea..7973669650b96a1a9386a182b6a64916420ea768 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -36,10 +36,10 @@
     #include "wx/statbmp.h"
     #include "wx/button.h"
     #include "wx/settings.h"
     #include "wx/statbmp.h"
     #include "wx/button.h"
     #include "wx/settings.h"

+    #include "wx/sizer.h"

 #endif //WX_PRECOMP
 
 #include "wx/statline.h"
 #endif //WX_PRECOMP
 
 #include "wx/statline.h"

-#include "wx/sizer.h"

 
 #include "wx/wizard.h"
 
 
 #include "wx/wizard.h"
 


@@ -631,7 +631,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         if ( !bmpPrev.Ok() )
             bmpPrev = m_bitmap;
 
         if ( !bmpPrev.Ok() )
             bmpPrev = m_bitmap;
 

-        if ( bmp != bmpPrev )
+        if ( !bmp.IsSameAs(bmpPrev) )

             m_statbmp->SetBitmap(bmp);
     }
 #endif // wxUSE_STATBMP
             m_statbmp->SetBitmap(bmp);
     }
 #endif // wxUSE_STATBMP


@@ -643,7 +643,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     bool hasNext = HasNextPage(m_page);
     if ( btnLabelWasNext != hasNext )
     {
     bool hasNext = HasNextPage(m_page);
     if ( btnLabelWasNext != hasNext )
     {

-        m_btnNext->SetLabel(hasNext ? _("&Next >") : _("&Finish"));
+        if ( hasNext )
+            m_btnNext->SetLabel(_("&Next >"));
+        else
+            m_btnNext->SetLabel(_("&Finish"));

     }
     // nothing to do: the label was already correct
 
     }
     // nothing to do: the label was already correct