realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with older wx versions

Browse Source 
ToInt was only added in wx 3.1.6 apparently, so for now make them long
types. Fixes bug introduced in 1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c

(Cherry-picked from 2b1040ae67819958e13b6bf945d81b1ce33eda42)
This commit is contained in:
Ian McInerney 2023-02-14 13:48:47 +00:00
parent e078fea846
commit 49f6a63a06
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripting/python_scripting.cpp
View File

@ -129,10 +129,10 @@ except:
wxVI.GetMajor(), wxVI.GetMinor(), wxVI.GetMicro() );
version = version.Mid( idx + 10 );
int wxPy_major = 0;
int wxPy_minor = 0;
int wxPy_micro = 0;
int wxPy_rev = 0;
long wxPy_major = 0;
long wxPy_minor = 0;
long wxPy_micro = 0;
long wxPy_rev = 0;
// Compile a regex to extract the wxPython version
wxRegEx re( "([0-9]+)\\.([0-9]+)\\.?([0-9]+)?\\.?([0-9]+)?" );
@ -143,22 +143,22 @@ except:
wxString v = re.GetMatch( version, 1 );
if( !v.IsEmpty() )
v.ToInt( &wxPy_major );
v.ToLong( &wxPy_major );
v = re.GetMatch( version, 2 );
if( !v.IsEmpty() )
v.ToInt( &wxPy_minor );
v.ToLong( &wxPy_minor );
v = re.GetMatch( version, 3 );
if( !v.IsEmpty() )
v.ToInt( &wxPy_micro );
v.ToLong( &wxPy_micro );
v = re.GetMatch( version, 4 );
if( !v.IsEmpty() )
v.ToInt( &wxPy_rev );
v.ToLong( &wxPy_rev );
}
if( ( wxVI.GetMajor() != wxPy_major ) || ( wxVI.GetMinor() != wxPy_minor ) )