set focus to the page after showing it -- otherwise it's lost (well, left on the...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 1e2e0f9fbf940e20e3a11f34900eb64552569e21..cd9c3152d040bef4799716d38e2f450ed28a9ca6 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -323,8 +323,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
     // use these labels to determine if we need to change the bitmap
     // for this page
 
     // use these labels to determine if we need to change the bitmap
     // for this page

-    wxBitmap   PreviousBitmap = wxNullBitmap;
-    wxBitmap   ThisBitmap = wxNullBitmap;
+    wxBitmap bmpPrev, bmpCur;

 
     // check for previous page
     if ( m_page )
 
     // check for previous page
     if ( m_page )


@@ -343,9 +342,9 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;
 
         // Get the bitmap of the previous page (if it exists)
         btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;
 
         // Get the bitmap of the previous page (if it exists)

-        if(m_page->GetBitmap().Ok())
-    {
-            PreviousBitmap = m_page->GetBitmap();
+        if ( m_page->GetBitmap().Ok() )
+        {
+            bmpPrev = m_page->GetBitmap();

         }
     }
 
         }
     }
 


@@ -368,12 +367,13 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     (void)m_page->TransferDataToWindow();
     m_page->SetSize(m_x, m_y, m_width, m_height);
     m_page->Show();
     (void)m_page->TransferDataToWindow();
     m_page->SetSize(m_x, m_y, m_width, m_height);
     m_page->Show();

+    m_page->SetFocus();

 
     // check if bitmap needs to be updated
     // update default flag as well
 
     // check if bitmap needs to be updated
     // update default flag as well

-    if(m_page->GetBitmap().Ok())
+    if ( m_page->GetBitmap().Ok() )

     {
     {

-        ThisBitmap = m_page->GetBitmap();
+        bmpCur = m_page->GetBitmap();

         bmpIsDefault = FALSE;
     }
 
         bmpIsDefault = FALSE;
     }
 


@@ -381,7 +381,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     // 1) a default bitmap was selected in constructor
     // 2) this page was constructed with a bitmap
     // 3) this bitmap is not the previous bitmap
     // 1) a default bitmap was selected in constructor
     // 2) this page was constructed with a bitmap
     // 3) this bitmap is not the previous bitmap

-    if( m_statbmp && (ThisBitmap != PreviousBitmap) )
+    if ( m_statbmp && (bmpCur != bmpPrev) )

     {
         wxBitmap bmp;
         if ( bmpIsDefault )
     {
         wxBitmap bmp;
         if ( bmpIsDefault )