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

gtk_frame_focus_out_callback can be called with g_activeFrame

Browse Source 
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:
Julian Smart
2004-10-13 20:47:12 +00:00
parent 7c57ddc300
commit cc0c05cd9f
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/toplevel.cpp
View File

@@ -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") ); // wxASSERT_MSG( (g_activeFrame == win), wxT("TLW deactivatd although it wasn't active") );
// wxPrintf( wxT("inactive: %s\n"), win->GetTitle().c_str() ); // 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; return FALSE;
} }

15
src/gtk1/toplevel.cpp
View File

@@ -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") ); // wxASSERT_MSG( (g_activeFrame == win), wxT("TLW deactivatd although it wasn't active") );
// wxPrintf( wxT("inactive: %s\n"), win->GetTitle().c_str() ); // 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; return FALSE;
} }