merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#include "wx/log.h"
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/control.h"
|
||||
#include "wx/app.h"
|
||||
@@ -835,6 +836,11 @@ void wxTopLevelWindowGTK::OnInternalIdle()
|
||||
if ( g_delayedFocus &&
|
||||
wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this )
|
||||
{
|
||||
wxLogTrace(_T("focus"),
|
||||
_T("Setting focus from wxTLW::OnIdle() to %s(%s)"),
|
||||
g_delayedFocus->GetClassInfo()->GetClassName(),
|
||||
g_delayedFocus->GetLabel().c_str());
|
||||
|
||||
g_delayedFocus->SetFocus();
|
||||
g_delayedFocus = NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user