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

crash in wxAppBase::SetActive fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-02 11:00:01 +00:00
parent c6dda38fee
commit 6e169cf31a
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/window.h
View File

@@ -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 // Find the wxWindow at the current mouse position, also returning the mouse
// position. // position.
WXDLLEXPORT extern wxWindow* wxFindWindowAtPointer(wxPoint& pt); WXDLLEXPORT extern wxWindow* wxFindWindowAtPointer(wxPoint& pt);

18
src/common/appcmn.cpp
View File

@@ -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