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

make sure ShowWithoutActivating only takes effect once

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-10-31 16:29:19 +00:00
parent 74d9b8fbd6
commit e88f9403f0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/toplevel.cpp
View File

@@ -358,6 +358,8 @@ gtk_frame_map_callback( GtkWidget*,
eventShow.SetEventObject(win); eventShow.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(eventShow); win->GetEventHandler()->ProcessEvent(eventShow);
} }
// restore focus-on-map setting in case ShowWithoutActivating() was called
gtk_window_set_focus_on_map(GTK_WINDOW(win->m_widget), true);
return false; return false;
} }
} }
@@ -891,8 +893,11 @@ bool wxTopLevelWindowGTK::Show( bool show )
void wxTopLevelWindowGTK::ShowWithoutActivating() void wxTopLevelWindowGTK::ShowWithoutActivating()
{ {
gtk_window_set_focus_on_map(GTK_WINDOW(m_widget), false); if (!m_isShown)
Show(true); {
gtk_window_set_focus_on_map(GTK_WINDOW(m_widget), false);
Show(true);
}
} }
void wxTopLevelWindowGTK::Raise() void wxTopLevelWindowGTK::Raise()