From 43321b802fc7179f4cf732195c984b7bc405c696 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 27 Aug 2012 06:36:40 +0000 Subject: [PATCH] reverting for the moment, original problem #12227, this leads eg in the mediaplayer sample to a non-show of the noteobook page git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/notebook_osx.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp index 94d609af4e..1c6e314ca8 100644 --- a/src/osx/notebook_osx.cpp +++ b/src/osx/notebook_osx.cpp @@ -342,6 +342,7 @@ void wxNotebook::OnSize(wxSizeEvent& 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 // has become visible for the first time after creation, and // we postponed showing the page in ChangePage(). @@ -355,6 +356,7 @@ void wxNotebook::OnSize(wxSizeEvent& event) pPage->SetFocus(); } } +#endif // Processing continues to next OnSize event.Skip(); @@ -480,6 +482,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) if ( nSel != wxNOT_FOUND ) { wxNotebookPage *pPage = m_pages[nSel]; +#if 0 // deactivate r65078 for the moment if ( IsShownOnScreen() ) { pPage->Show( true ); @@ -494,6 +497,10 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) // We Show() the selected page in our OnSize handler, // unless it already is shown. } +#else + pPage->Show( true ); + pPage->SetFocus(); +#endif } m_selection = nSel;