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

implemented wxActivateEvent properly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-09-28 23:37:52 +00:00
parent 2545022c72
commit e8c12a53e8
2 changed files with 94 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/gtk/window.cpp
View File

@@ -216,6 +216,11 @@ static bool g_captureWindowHasMouse = FALSE;
// keeps its previous value // keeps its previous value
static wxWindowGTK *g_focusWindowLast = (wxWindowGTK *)NULL; static wxWindowGTK *g_focusWindowLast = (wxWindowGTK *)NULL;
// the frame that is currently active (i.e. its child has focus). It is
// used to generate wxActivateEvents
static wxWindowGTK *g_activeFrame = (wxWindowGTK *)NULL;
static bool g_activeFrameLostFocus = FALSE;
// if we detect that the app has got/lost the focus, we set this variable to // if we detect that the app has got/lost the focus, we set this variable to
// either TRUE or FALSE and an activate event will be sent during the next // either TRUE or FALSE and an activate event will be sent during the next
// OnIdle() call and it is reset to -1: this value means that we shouldn't // OnIdle() call and it is reset to -1: this value means that we shouldn't
@@ -358,6 +363,16 @@ wxWindow *wxFindFocusedChild(wxWindowGTK *win)
return (wxWindow *)NULL; return (wxWindow *)NULL;
} }
// Returns toplevel grandparent of given window:
static wxWindowGTK* wxGetTopLevelParent(wxWindowGTK *win)
{
wxWindowGTK *p = win;
while (p && !p->IsTopLevel())
p = p->GetParent();
return p;
}
static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
{ {
// wxUniversal widgets draw the borders and scrollbars themselves // wxUniversal widgets draw the borders and scrollbars themselves
@@ -1709,14 +1724,24 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget,
} }
#endif // wxUSE_CARET #endif // wxUSE_CARET
if (win->IsTopLevel())
wxWindowGTK *active = wxGetTopLevelParent(win);
if ( active != g_activeFrame )
{ {
wxActivateEvent event( wxEVT_ACTIVATE, TRUE, win->GetId() ); if ( g_activeFrame )
event.SetEventObject( win ); {
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
g_activeFrame->GetEventHandler()->ProcessEvent(event);
}
// ignore return value g_activeFrame = active;
win->GetEventHandler()->ProcessEvent( event ); wxActivateEvent event(wxEVT_ACTIVATE, TRUE, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
g_activeFrame->GetEventHandler()->ProcessEvent(event);
} }
g_activeFrameLostFocus = FALSE;
wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
@@ -1791,14 +1816,8 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
} }
#endif // wxUSE_CARET #endif // wxUSE_CARET
if (win->IsTopLevel()) wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame, wxT("unfocusing window that haven't gained focus properly") )
{ g_activeFrameLostFocus = TRUE;
wxActivateEvent event( wxEVT_ACTIVATE, FALSE, win->GetId() );
event.SetEventObject( win );
// ignore return value
win->GetEventHandler()->ProcessEvent( event );
}
wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
@@ -2491,6 +2510,9 @@ wxWindowGTK::~wxWindowGTK()
if (g_focusWindow == this) if (g_focusWindow == this)
g_focusWindow = NULL; g_focusWindow = NULL;
if (g_activeFrame == this)
g_activeFrame = NULL;
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
m_hasVMT = FALSE; m_hasVMT = FALSE;
@@ -2810,6 +2832,18 @@ void wxWindowGTK::OnInternalIdle()
wxTheApp->SetActive(activate, (wxWindow *)g_focusWindowLast); wxTheApp->SetActive(activate, (wxWindow *)g_focusWindowLast);
} }
if ( g_activeFrameLostFocus )
{
if ( g_activeFrame )
{
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
g_activeFrame->GetEventHandler()->ProcessEvent(event);
g_activeFrame = NULL;
}
g_activeFrameLostFocus = FALSE;
}
wxCursor cursor = m_cursor; wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor; if (g_globalCursor.Ok()) cursor = g_globalCursor;

60
src/gtk1/window.cpp
View File

@@ -216,6 +216,11 @@ static bool g_captureWindowHasMouse = FALSE;
// keeps its previous value // keeps its previous value
static wxWindowGTK *g_focusWindowLast = (wxWindowGTK *)NULL; static wxWindowGTK *g_focusWindowLast = (wxWindowGTK *)NULL;
// the frame that is currently active (i.e. its child has focus). It is
// used to generate wxActivateEvents
static wxWindowGTK *g_activeFrame = (wxWindowGTK *)NULL;
static bool g_activeFrameLostFocus = FALSE;
// if we detect that the app has got/lost the focus, we set this variable to // if we detect that the app has got/lost the focus, we set this variable to
// either TRUE or FALSE and an activate event will be sent during the next // either TRUE or FALSE and an activate event will be sent during the next
// OnIdle() call and it is reset to -1: this value means that we shouldn't // OnIdle() call and it is reset to -1: this value means that we shouldn't
@@ -358,6 +363,16 @@ wxWindow *wxFindFocusedChild(wxWindowGTK *win)
return (wxWindow *)NULL; return (wxWindow *)NULL;
} }
// Returns toplevel grandparent of given window:
static wxWindowGTK* wxGetTopLevelParent(wxWindowGTK *win)
{
wxWindowGTK *p = win;
while (p && !p->IsTopLevel())
p = p->GetParent();
return p;
}
static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
{ {
// wxUniversal widgets draw the borders and scrollbars themselves // wxUniversal widgets draw the borders and scrollbars themselves
@@ -1709,14 +1724,24 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget,
} }
#endif // wxUSE_CARET #endif // wxUSE_CARET
if (win->IsTopLevel())
wxWindowGTK *active = wxGetTopLevelParent(win);
if ( active != g_activeFrame )
{ {
wxActivateEvent event( wxEVT_ACTIVATE, TRUE, win->GetId() ); if ( g_activeFrame )
event.SetEventObject( win ); {
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
g_activeFrame->GetEventHandler()->ProcessEvent(event);
}
// ignore return value g_activeFrame = active;
win->GetEventHandler()->ProcessEvent( event ); wxActivateEvent event(wxEVT_ACTIVATE, TRUE, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
g_activeFrame->GetEventHandler()->ProcessEvent(event);
} }
g_activeFrameLostFocus = FALSE;
wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
@@ -1791,14 +1816,8 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
} }
#endif // wxUSE_CARET #endif // wxUSE_CARET
if (win->IsTopLevel()) wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame, wxT("unfocusing window that haven't gained focus properly") )
{ g_activeFrameLostFocus = TRUE;
wxActivateEvent event( wxEVT_ACTIVATE, FALSE, win->GetId() );
event.SetEventObject( win );
// ignore return value
win->GetEventHandler()->ProcessEvent( event );
}
wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
@@ -2491,6 +2510,9 @@ wxWindowGTK::~wxWindowGTK()
if (g_focusWindow == this) if (g_focusWindow == this)
g_focusWindow = NULL; g_focusWindow = NULL;
if (g_activeFrame == this)
g_activeFrame = NULL;
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
m_hasVMT = FALSE; m_hasVMT = FALSE;
@@ -2810,6 +2832,18 @@ void wxWindowGTK::OnInternalIdle()
wxTheApp->SetActive(activate, (wxWindow *)g_focusWindowLast); wxTheApp->SetActive(activate, (wxWindow *)g_focusWindowLast);
} }
if ( g_activeFrameLostFocus )
{
if ( g_activeFrame )
{
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
g_activeFrame->GetEventHandler()->ProcessEvent(event);
g_activeFrame = NULL;
}
g_activeFrameLostFocus = FALSE;
}
wxCursor cursor = m_cursor; wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor; if (g_globalCursor.Ok()) cursor = g_globalCursor;