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

fix for handling (Shift-)Ctrl-Tab when the notebook itself has focus (patch 813507)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-27 12:34:05 +00:00
parent 724a907cbb
commit 1d5b3bf041
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/notebook.cpp
View File

@@ -727,6 +727,23 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
{
wxNotebookPage *pPage = m_pages[sel];
pPage->Show(true);
pPage->SetFocus();
// If the newly focused window is not a child of the new page,
// SetFocus was not successful and the notebook itself should be
// focused
wxWindow *currentFocus = FindFocus();
wxWindow *startFocus = currentFocus;
while ( currentFocus && currentFocus != pPage && currentFocus != this )
currentFocus = currentFocus->GetParent();
if ( startFocus == pPage || currentFocus != pPage )
SetFocus();
}
else // no pages in the notebook, give the focus to itself
{
SetFocus();
}
m_nSelection = sel;
@@ -740,12 +757,14 @@ bool wxNotebook::MSWTranslateMessage(WXMSG *wxmsg)
{
const MSG * const msg = (MSG *)wxmsg;
// we want to process (simple, i.e. without Shift or Ctrl) TAB to pass it
// to our page for keyboard navigation
// intercept TAB, CTRL+TAB and CTRL+SHIFT+TAB for processing by wxNotebook.
// TAB will be passed to the currently selected page, CTRL+TAB and
// CTRL+SHIFT+TAB will be processed by the notebook itself. do not
// intercept SHIFT+TAB. This goes to the parent of the notebook which will
// process it.
if ( msg->message == WM_KEYDOWN && msg->wParam == VK_TAB &&
msg->hwnd == m_hwnd &&
!wxIsCtrlDown() && !wxIsShiftDown() &&
m_nSelection != -1 )
(wxIsCtrlDown() || !wxIsShiftDown()) )
{
return MSWProcessMessage(wxmsg);
}