gtk_frame_focus_out_callback can be called with g_activeFrame
null; so test for it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7c57ddc300
commit
cc0c05cd9f
@ -134,13 +134,16 @@ static gint gtk_frame_focus_out_callback( GtkWidget *widget,
|
||||
// wxASSERT_MSG( (g_activeFrame == win), wxT("TLW deactivatd although it wasn't active") );
|
||||
|
||||
// wxPrintf( wxT("inactive: %s\n"), win->GetTitle().c_str() );
|
||||
|
||||
wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
|
||||
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
|
||||
event.SetEventObject(g_activeFrame);
|
||||
g_activeFrame->GetEventHandler()->ProcessEvent(event);
|
||||
|
||||
g_activeFrame = NULL;
|
||||
if (g_activeFrame)
|
||||
{
|
||||
wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
|
||||
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
|
||||
event.SetEventObject(g_activeFrame);
|
||||
g_activeFrame->GetEventHandler()->ProcessEvent(event);
|
||||
|
||||
g_activeFrame = NULL;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
@ -134,13 +134,16 @@ static gint gtk_frame_focus_out_callback( GtkWidget *widget,
|
||||
// wxASSERT_MSG( (g_activeFrame == win), wxT("TLW deactivatd although it wasn't active") );
|
||||
|
||||
// wxPrintf( wxT("inactive: %s\n"), win->GetTitle().c_str() );
|
||||
|
||||
wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
|
||||
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
|
||||
event.SetEventObject(g_activeFrame);
|
||||
g_activeFrame->GetEventHandler()->ProcessEvent(event);
|
||||
|
||||
g_activeFrame = NULL;
|
||||
if (g_activeFrame)
|
||||
{
|
||||
wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
|
||||
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
|
||||
event.SetEventObject(g_activeFrame);
|
||||
g_activeFrame->GetEventHandler()->ProcessEvent(event);
|
||||
|
||||
g_activeFrame = NULL;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user