crash in wxAppBase::SetActive fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/window.h b/include/wx/window.h
index f6d7b332c2e985c1854731b6b61cbd59d0259b69..bbcd44aa98290827b1a76eeb976d9ef6b932fd79 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1002,8 +1002,6 @@ inline wxWindow *wxWindowBase::GetGrandParent() const
 // global functions
 // ----------------------------------------------------------------------------
 
 // global functions
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT extern wxWindow* wxGetActiveWindow();
-

 // Find the wxWindow at the current mouse position, also returning the mouse
 // position.
 WXDLLEXPORT extern wxWindow* wxFindWindowAtPointer(wxPoint& pt);
 // Find the wxWindow at the current mouse position, also returning the mouse
 // position.
 WXDLLEXPORT extern wxWindow* wxFindWindowAtPointer(wxPoint& pt);

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 761c50b9ff26b68aa01956de8fdb14a4d156dfea..0b7b957dc3378b6a0e91230cbd03ef92db631b75 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -130,25 +130,9 @@ void wxAppBase::ProcessPendingEvents()
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-void wxAppBase::SetActive(bool active, wxWindow *lastFocus)
+void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))

 {
 {

-    static wxWindow *s_lastFocus = (wxWindow *)NULL;
-

     m_isActive = active;
     m_isActive = active;

-
-    // if we're being deactivated remember the last focused window
-    if ( !active )
-    {
-        s_lastFocus = lastFocus;
-    }
-
-    if ( s_lastFocus )
-    {
-        // give the focused window the chance to refresh itself if its
-        // appearance depends on the app activation state
-        wxActivateEvent event(wxEVT_ACTIVATE, active);
-        s_lastFocus->GetEventHandler()->ProcessEvent(event);
-    }

 }
 
 #endif // wxUSE_GUI
 }
 
 #endif // wxUSE_GUI