X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/937d5b6075db060b98daa0f0fadbaa528bc85554..9741fd45f734ea30e094f5b15f092b8394621204:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 87a6ca1a35..1e9a26dbbf 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -30,6 +30,7 @@ #include "wx/dcclient.h" #include "wx/dcmemory.h" #include "wx/control.h" + #include "wx/panel.h" #endif // WX_PRECOMP #include "wx/imaglist.h" @@ -818,6 +819,14 @@ bool wxNotebook::InsertPage(size_t nPage, // succeeded: save the pointer to the page m_pages.Insert(pPage, nPage); + // also ensure that the notebook background is used for its pages by making + // them transparent: this ensures that MSWGetBgBrush() queries the notebook + // for the background brush to be used for erasing them + if ( wxPanel *panel = wxDynamicCast(pPage, wxPanel) ) + { + panel->MSWSetTransparentBackground(); + } + // we may need to adjust the size again if the notebook size changed: // normally this only happens for the first page we add (the tabs which // hadn't been there before are now shown) but for a multiline notebook it @@ -1129,11 +1138,21 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE const bool isFromParent = event.GetEventObject() == (wxObject*) parent; const bool isFromSelf = event.GetEventObject() == (wxObject*) this; + const bool isForward = event.GetDirection(); - if ( isFromParent || isFromSelf ) + if ( isFromSelf && !isForward ) + { + // focus is currently on notebook tab and should leave + // it backwards (Shift-TAB) + event.SetCurrentFocus(this); + parent->HandleWindowEvent(event); + } + else if ( isFromParent || isFromSelf ) { // no, it doesn't come from child, case (b) or (c): forward to a - // page but only if direction is backwards (TAB) or from ourselves, + // page but only if entering notebook page (i.e. direction is + // backwards (Shift-TAB) comething from out-of-notebook, or + // direction is forward (TAB) from ourselves), if ( m_nSelection != wxNOT_FOUND && (!event.GetDirection() || isFromSelf) ) { @@ -1159,7 +1178,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // if the direction is forwards. Otherwise set the focus to the // notebook itself. The notebook is always the 'first' control of a // page. - if ( !event.GetDirection() ) + if ( !isForward ) { SetFocus(); }