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

reverting for the moment, original problem #12227, this leads eg in the mediaplayer sample to a non-show of the noteobook page

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2012-08-27 06:36:40 +00:00
parent 45f0926d41
commit 43321b802f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osx/notebook_osx.cpp
View File

@ -342,6 +342,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
pPage->SetSize(rect, wxSIZE_FORCE_EVENT); pPage->SetSize(rect, wxSIZE_FORCE_EVENT);
} }
#if 0 // deactivate r65078 for the moment
// If the selected page is hidden at this point, the notebook // If the selected page is hidden at this point, the notebook
// has become visible for the first time after creation, and // has become visible for the first time after creation, and
// we postponed showing the page in ChangePage(). // we postponed showing the page in ChangePage().
@ -355,6 +356,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
pPage->SetFocus(); pPage->SetFocus();
} }
} }
#endif
// Processing continues to next OnSize // Processing continues to next OnSize
event.Skip(); event.Skip();
@ -480,6 +482,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
if ( nSel != wxNOT_FOUND ) if ( nSel != wxNOT_FOUND )
{ {
wxNotebookPage *pPage = m_pages[nSel]; wxNotebookPage *pPage = m_pages[nSel];
#if 0 // deactivate r65078 for the moment
if ( IsShownOnScreen() ) if ( IsShownOnScreen() )
{ {
pPage->Show( true ); pPage->Show( true );
@ -494,6 +497,10 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
// We Show() the selected page in our OnSize handler, // We Show() the selected page in our OnSize handler,
// unless it already is shown. // unless it already is shown.
} }
#else
pPage->Show( true );
pPage->SetFocus();
#endif
} }
m_selection = nSel; m_selection = nSel;