use native conversions that are close to the native storage of wxString

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

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

-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)
+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)
 
 BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel)


@@ -289,7 +289,7 @@ wxSize wxWizardSizer::SiblingSize(wxSizerItem *child)
 void wxWizard::Init()
 {
     m_posWizard = wxDefaultPosition;
 void wxWizard::Init()
 {
     m_posWizard = wxDefaultPosition;

-    m_page = (wxWizardPage *)NULL;
+    m_page = NULL;

     m_btnPrev = m_btnNext = NULL;
     m_statbmp = NULL;
     m_sizerBmpAndPage = NULL;
     m_btnPrev = m_btnNext = NULL;
     m_statbmp = NULL;
     m_sizerBmpAndPage = NULL;


@@ -558,10 +558,6 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     }
 
 
     }
 
 

-    // we'll use this to decide whether we have to change the label of this
-    // button or not (initially the label is "Next")
-    bool btnLabelWasNext = true;
-

     // remember the old bitmap (if any) to compare with the new one later
     wxBitmap bmpPrev;
 
     // remember the old bitmap (if any) to compare with the new one later
     wxBitmap bmpPrev;
 


@@ -580,8 +576,6 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
         m_page->Hide();
 
 
         m_page->Hide();
 

-        btnLabelWasNext = HasNextPage(m_page);
-

         bmpPrev = m_page->GetBitmap();
 
         if ( !m_usingSizer )
         bmpPrev = m_page->GetBitmap();
 
         if ( !m_usingSizer )


@@ -651,15 +645,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     // and update the buttons state
     m_btnPrev->Enable(HasPrevPage(m_page));
 
     // and update the buttons state
     m_btnPrev->Enable(HasPrevPage(m_page));
 

-    bool hasNext = HasNextPage(m_page);
-    if ( btnLabelWasNext != hasNext )
-    {
-        if ( hasNext )
-            m_btnNext->SetLabel(_("&Next >"));
-        else
-            m_btnNext->SetLabel(_("&Finish"));
-    }
-    // nothing to do: the label was already correct
+    const bool hasNext = HasNextPage(m_page);
+    const wxString label = hasNext ? _("&Next >") : _("&Finish");
+    if ( label != m_btnNext->GetLabel() )
+        m_btnNext->SetLabel(label);

 
     m_btnNext->SetDefault();
 
 
     m_btnNext->SetDefault();