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

implemented wxActivateEvent and restoring focus after a TLW that owned it was destroyed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-25 12:20:25 +00:00
parent c821db16e6
commit 6954a1e2c9
5 changed files with 61 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/dfb/nonownedwnd.cpp
View File

@@ -243,20 +243,7 @@ bool wxNonOwnedWindow::Show(bool show)
m_dfbwin->SetOpacity(show ? m_opacity : 0);
if ( show )
{
wxWindow *focused = wxWindow::FindFocus();
if ( focused && focused->GetTLW() == this )
{
SetDfbFocus();
}
else if ( CanAcceptFocus() )
{
// FIXME: we should probably always call SetDfbFocus instead
// and call SetFocus() from wxActivateEvent/DWET_GOTFOCUS
// handler
SetFocus();
}
}
SetDfbFocus();
return true;
}
@@ -403,42 +390,41 @@ void wxNonOwnedWindow::HandleDFBWindowEvent(const wxDFBWindowEvent& event_)
}
wxNonOwnedWindow *tlw = gs_dfbWindowsMap[event.window_id];
wxWindow *recipient = NULL;
void (wxWindow::*handlerFunc)(const wxDFBWindowEvent&) = NULL;
switch ( event.type )
{
case DWET_KEYDOWN:
case DWET_KEYUP:
{
recipient = wxWindow::FindFocus();
handlerFunc = &wxWindowDFB::HandleKeyEvent;
wxWindow *recipient = wxWindow::FindFocus();
if ( !recipient )
{
wxLogTrace(TRACE_EVENTS,
_T("ignoring event: no recipient window"));
return;
}
wxCHECK_RET( recipient && recipient->GetTLW() == tlw,
_T("event recipient not in TLW which received the event") );
recipient->HandleKeyEvent(event_);
break;
}
case DWET_GOTFOCUS:
case DWET_LOSTFOCUS:
tlw->HandleFocusEvent(event_);
break;
case DWET_NONE:
case DWET_ALL:
{
wxFAIL_MSG( _T("invalid event type") );
break;
}
default:
// we're not interested in them here
break;
}
if ( !recipient )
{
wxLogTrace(TRACE_EVENTS, _T("ignoring event: no recipient window"));
return;
}
wxCHECK_RET( recipient && recipient->GetTLW() == tlw,
_T("event recipient not in TLW which received the event") );
// process the event:
(recipient->*handlerFunc)(event_);
}
// ---------------------------------------------------------------------------