no more _ftime instead of ftime

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 9c0e7739439136d7282d7349a26ce69097afcae1..fdd9dc7a8ccbca1d4a4336f3fc0d10edd6d54b0c 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -185,7 +185,7 @@ wxWizard::wxWizard(wxWindow *parent,
 
     if ( pos == wxDefaultPosition )
     {
 
     if ( pos == wxDefaultPosition )
     {

-        Centre();
+        CentreOnScreen();

     }
 }
 
     }
 }
 


@@ -249,7 +249,12 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     bool bmpIsDefault = !m_page->GetBitmap().Ok();
     if ( m_statbmp && (bmpIsDefault != bmpWasDefault) )
     {
     bool bmpIsDefault = !m_page->GetBitmap().Ok();
     if ( m_statbmp && (bmpIsDefault != bmpWasDefault) )
     {

-        m_statbmp->SetBitmap(bmpIsDefault ? m_bitmap : m_page->GetBitmap());
+        wxBitmap bmp;
+        if ( bmpIsDefault )
+            bmp = m_bitmap;
+        else
+            bmp = m_page->GetBitmap();
+        m_statbmp->SetBitmap(bmp);

     }
 
     // and update the buttons state
     }
 
     // and update the buttons state