From cc0c05cd9ffc1956300bf0f13098b13e16ffd751 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 13 Oct 2004 20:47:12 +0000 Subject: [PATCH] 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 --- src/gtk/toplevel.cpp | 15 +++++++++------ src/gtk1/toplevel.cpp | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index f676189095..f0258fbd24 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -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; } diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index f676189095..f0258fbd24 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -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; } -- 2.45.2