Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set focus to the page after showing it -- otherwise it's lost (well, left on the previous, now hidden, page)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-06-03 23:10:56 +00:00
parent d515c32dc3
commit a3e8c656ca
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/wizard.cpp
View File

@@ -323,8 +323,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
// use these labels to determine if we need to change the bitmap // use these labels to determine if we need to change the bitmap
// for this page // for this page
wxBitmap PreviousBitmap = wxNullBitmap; wxBitmap bmpPrev, bmpCur;
wxBitmap ThisBitmap = wxNullBitmap;
// check for previous page // check for previous page
if ( m_page ) if ( m_page )
@@ -343,9 +342,9 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL; btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;
// Get the bitmap of the previous page (if it exists) // Get the bitmap of the previous page (if it exists)
if(m_page->GetBitmap().Ok()) if ( m_page->GetBitmap().Ok() )
{ {
PreviousBitmap = m_page->GetBitmap(); bmpPrev = m_page->GetBitmap();
} }
} }
@@ -368,12 +367,13 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
(void)m_page->TransferDataToWindow(); (void)m_page->TransferDataToWindow();
m_page->SetSize(m_x, m_y, m_width, m_height); m_page->SetSize(m_x, m_y, m_width, m_height);
m_page->Show(); m_page->Show();
m_page->SetFocus();
// check if bitmap needs to be updated // check if bitmap needs to be updated
// update default flag as well // 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 // 1) a default bitmap was selected in constructor
// 2) this page was constructed with a bitmap // 2) this page was constructed with a bitmap
// 3) this bitmap is not the previous bitmap // 3) this bitmap is not the previous bitmap
if( m_statbmp && (ThisBitmap != PreviousBitmap) ) if ( m_statbmp && (bmpCur != bmpPrev) )
{ {
wxBitmap bmp; wxBitmap bmp;
if ( bmpIsDefault ) if ( bmpIsDefault )