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

try to fix a wx3.0/wx3.1 compatibility

This commit is contained in:
jean-pierre charras 2022-11-07 20:26:36 +01:00
parent b5f62da5d9
commit 05336798ac
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
eeschema/dialogs/dialog_sim_model.cpp
View File

@ -298,7 +298,7 @@ void DIALOG_SIM_MODEL<T>::updateWidgets()
updateModelParamsTab(); updateModelParamsTab();
updateModelCodeTab(); updateModelCodeTab();
updatePinAssignments(); updatePinAssignments();
m_excludeCheckbox->SetValue( !curModel().IsEnabled() ); m_excludeCheckbox->SetValue( !curModel().IsEnabled() );
std::string ref = SIM_MODEL::GetFieldValue( &m_fields, SIM_MODEL::REFERENCE_FIELD ); std::string ref = SIM_MODEL::GetFieldValue( &m_fields, SIM_MODEL::REFERENCE_FIELD );
@ -430,7 +430,7 @@ void DIALOG_SIM_MODEL<T>::updateModelParamsTab()
for( wxPropertyGridIterator it = m_paramGrid->GetIterator(); !it.AtEnd(); ++it ) for( wxPropertyGridIterator it = m_paramGrid->GetIterator(); !it.AtEnd(); ++it )
{ {
SIM_PROPERTY* prop = dynamic_cast<SIM_PROPERTY*>( *it ); SIM_PROPERTY* prop = dynamic_cast<SIM_PROPERTY*>( *it );
if( !prop ) if( !prop )
continue; continue;
@ -475,7 +475,7 @@ void DIALOG_SIM_MODEL<T>::updateModelCodeTab()
if( dynamic_cast<SIM_MODEL_RAW_SPICE*>( &curModel() ) ) if( dynamic_cast<SIM_MODEL_RAW_SPICE*>( &curModel() ) )
{ {
// For raw Spice models display the whole file instead. // For raw Spice models display the whole file instead.
wxString path = curModel().FindParam( "lib" )->value->ToString(); wxString path = curModel().FindParam( "lib" )->value->ToString();
wxString absolutePath = Prj().AbsolutePath( path ); wxString absolutePath = Prj().AbsolutePath( path );
wxTextFile file; wxTextFile file;
@ -816,10 +816,17 @@ wxPGProperty* DIALOG_SIM_MODEL<T>::newParamProperty( int aParamIndex ) const
prop->SetAttribute( wxPG_ATTR_UNITS, wxString::FromUTF8( param.info.unit.c_str() ) ); prop->SetAttribute( wxPG_ATTR_UNITS, wxString::FromUTF8( param.info.unit.c_str() ) );
// Legacy due to the way we extracted the parameters from Ngspice. // Legacy due to the way we extracted the parameters from Ngspice.
if( param.isOtherVariant ) #if wxCHECK_VERSION( 3, 1, 0 )
prop->SetCell( 3, wxString::FromUTF8( param.info.defaultValueOfOtherVariant ) ); if( param.isOtherVariant )
else prop->SetCell( 3, wxString::FromUTF8( param.info.defaultValueOfOtherVariant ) );
prop->SetCell( 3, wxString::FromUTF8( param.info.defaultValue ) ); else
prop->SetCell( 3, wxString::FromUTF8( param.info.defaultValue ) );
#else
if( param.isOtherVariant )
prop->SetCell( 3, wxString::FromUTF8( param.info.defaultValueOfOtherVariant.c_str() ) );
else
prop->SetCell( 3, wxString::FromUTF8( param.info.defaultValue.c_str() ) );
#endif
wxString typeStr; wxString typeStr;