haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to handle more edge cases in wxPython version check 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/13354
This commit is contained in:
Jon Evans 2023-01-02 12:58:42 -05:00
parent 277cd73204
commit f4a80903f0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripting/python_scripting.cpp
View File

@ -90,8 +90,12 @@ bool SCRIPTING::IsWxAvailable()
pybind11::dict locals;
pybind11::exec( R"(
from wx import version
wx_version = version()
wx_version = ""
try:
from wx import version
wx_version = version()
except (ImportError, ModuleNotFoundError):
pass
)", pybind11::globals(), locals );
// e.g. "4.0.7 gtk3 (phoenix) wxWidgets 3.0.4"
@ -99,7 +103,7 @@ wx_version = version()
int idx = version.Find( wxT( "wxWidgets " ) );
if( idx == wxNOT_FOUND )
if( idx == wxNOT_FOUND || version.IsEmpty() )
{
wxLogError( wxT( "Could not determine wxPython version. "
"Python plugins will not be available." ) );
@ -107,7 +111,9 @@ wx_version = version()
}
version = version.Mid( idx + 10 );
wxString wxVersion = wxGetLibraryVersionInfo().GetVersionString();
wxVersionInfo wxVI = wxGetLibraryVersionInfo();
wxString wxVersion = wxString::Format( wxT( "%d.%d.%d" ),
wxVI.GetMajor(), wxVI.GetMinor(), wxVI.GetMicro() );
if( wxVersion.Cmp( version ) != 0 )
{