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

Some Updates for latest CVS.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-08-06 20:40:31 +00:00
parent cdebf9851e
commit 1bcfc0e1b9
3 changed files with 36 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/os2/window.cpp
View File

@@ -2006,17 +2006,9 @@ bool wxWindowOS2::OS2ProcessMessage(
}
else
{
wxPanel* pPanel = wxDynamicCast(this, wxPanel);
wxButton* pBtn = NULL;
if (pPanel)
{
//
// Panel may have a default button which should
// be activated by Enter
//
pBtn = pPanel->GetDefaultItem();
}
wxButton* pBtn = wxDynamicCast( GetDefaultItem()
,wxButton
);
if (pBtn && pBtn->IsEnabled())
{
@@ -2893,32 +2885,6 @@ void wxWindowOS2::OnSetFocus(
wxFocusEvent& rEvent
)
{
//
// Panel wants to track the window which was the last to have focus in it,
// so we want to set ourselves as the window which last had focus
//
// Notice that it's also important to do it upwards the tree becaus
// otherwise when the top level panel gets focus, it won't set it back to
// us, but to some other sibling
//
wxWindow* pWin = this;
while (pWin)
{
wxWindow* pParent = pWin->GetParent();
wxPanel* pPanel = wxDynamicCast( pParent
,wxPanel
);
if (pPanel)
{
pPanel->SetLastFocus(pWin);
}
pWin = pParent;
}
wxLogTrace(_T("focus"), _T("%s (0x%08x) gets focus"),
GetClassInfo()->GetClassName(), GetHandle());
rEvent.Skip();
} // end of wxWindowOS2::OnSetFocus
@@ -2949,16 +2915,14 @@ bool wxWindowOS2::HandleSetFocus(
}
#endif // wxUSE_CARET
//
// Panel wants to track the window which was the last to have focus in it
//
wxPanel* pPanel = wxDynamicCast( GetParent()
,wxPanel
);
if (pPanel)
#if wxUSE_TEXTCTRL
// If it's a wxTextCtrl don't send the event as it will be done
// after the control gets to process it from EN_FOCUS handler
if ( wxDynamicCastThis(wxTextCtrl) )
{
pPanel->SetLastFocus(this);
return FALSE;
}
#endif // wxUSE_TEXTCTRL
wxFocusEvent vEvent(wxEVT_SET_FOCUS, m_windowId);