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

update _GOptionGroup check

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-11-28 05:11:27 +00:00
parent 514b0e137e
commit 8f81f01db3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/utilsgtk.cpp
View File

@@ -466,11 +466,11 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
{ {
// since GTK>=2.6, we can use the glib_check_version() symbol... // since GTK>=2.6, we can use the glib_check_version() symbol...
// check whether GLib version is greater than 2.6 but also lower than 2.19 // check whether GLib version is greater than 2.6 but also lower than 2.31
// because, as we use the undocumented _GOptionGroup struct, we don't want // because, as we use the undocumented _GOptionGroup struct, we don't want
// to run this code with future versions which might change it (2.19 is the // to run this code with future versions which might change it (2.30 is the
// latest one at the time of this writing) // latest one at the time of this writing)
if (!glib_check_version(2,6,0) && glib_check_version(2,20,0)) if (glib_check_version(2,6,0) == NULL && glib_check_version(2,31,0))
{ {
usage << _("The following standard GTK+ options are also supported:\n"); usage << _("The following standard GTK+ options are also supported:\n");