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

update minimum GTK2 version requirement to 2.6

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-07-10 16:39:44 +00:00
parent abac13f901
commit 4e621d2471
18 changed files with 18 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/toplevel.cpp
View File

@@ -354,15 +354,10 @@ gtk_frame_map_callback( GtkWidget*,
win->GetEventHandler()->ProcessEvent(eventShow);
}
#if GTK_CHECK_VERSION(2,6,0)
#ifndef __WXGTK3__
if (!gtk_check_version(2,6,0))
#endif
{
// restore focus-on-map setting in case ShowWithoutActivating() was called
gtk_window_set_focus_on_map(GTK_WINDOW(win->m_widget), true);
}
#endif // GTK+ 2.6+
return false;
}
@@ -977,12 +972,7 @@ void wxTopLevelWindowGTK::ShowWithoutActivating()
{
if (!m_isShown)
{
#if GTK_CHECK_VERSION(2,6,0)
#ifndef __WXGTK3__
if (!gtk_check_version(2,6,0))
#endif
gtk_window_set_focus_on_map(GTK_WINDOW(m_widget), false);
#endif // GTK+ 2.6+
Show(true);
}