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

an (blind) attempt to fix wxGTK frame activation bug

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-05 22:08:35 +00:00
parent f5e6ed7cc8
commit e07f9efa03
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/window.cpp
View File

@@ -1772,6 +1772,9 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnDrag) return FALSE;
wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame, wxT("unfocusing window that haven't gained focus properly") )
g_activeFrameLostFocus = TRUE;
// VZ: this is really weird but GTK+ seems to call us from inside // VZ: this is really weird but GTK+ seems to call us from inside
// gtk_widget_grab_focus(), i.e. it first sends "focus_out" signal to // gtk_widget_grab_focus(), i.e. it first sends "focus_out" signal to
// this widget and then "focus_in". This is totally unexpected and // this widget and then "focus_in". This is totally unexpected and
@@ -1816,9 +1819,6 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
} }
#endif // wxUSE_CARET #endif // wxUSE_CARET
wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame, wxT("unfocusing window that haven't gained focus properly") )
g_activeFrameLostFocus = TRUE;
wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );

6
src/gtk1/window.cpp
View File

@@ -1772,6 +1772,9 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnDrag) return FALSE;
wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame, wxT("unfocusing window that haven't gained focus properly") )
g_activeFrameLostFocus = TRUE;
// VZ: this is really weird but GTK+ seems to call us from inside // VZ: this is really weird but GTK+ seems to call us from inside
// gtk_widget_grab_focus(), i.e. it first sends "focus_out" signal to // gtk_widget_grab_focus(), i.e. it first sends "focus_out" signal to
// this widget and then "focus_in". This is totally unexpected and // this widget and then "focus_in". This is totally unexpected and
@@ -1816,9 +1819,6 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
} }
#endif // wxUSE_CARET #endif // wxUSE_CARET
wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame, wxT("unfocusing window that haven't gained focus properly") )
g_activeFrameLostFocus = TRUE;
wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );