Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Save notebook page titles rather than index. 

(Some notebooks have variable pages from invocation
to invocation.)

Also adds bounds-checking where appropriate.
pull/18/head
Jeff Young 2 months ago
parent
5a358d99bb
commit
5805f67459
1 changed files with 18 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      common/dialog_shim.cpp

21
common/dialog_shim.cpp
View File

@ -511,7 +511,12 @@ void DIALOG_SHIM::LoadControlState()
else if( wxOwnerDrawnComboBox* od_combo = dynamic_cast<wxOwnerDrawnComboBox*>( win ) )
{
if( j.is_number_integer() )
od_combo->SetSelection( j.get<int>() );
{
int index = j.get<int>();
if( index >= 0 && index < (int) od_combo->GetCount() )
od_combo->SetSelection( index );
}
}
else if( wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( win ) )
{
@ -521,7 +526,12 @@ void DIALOG_SHIM::LoadControlState()
else if( wxChoice* choice = dynamic_cast<wxChoice*>( win ) )
{
if( j.is_number_integer() )
choice->SetSelection( j.get<int>() );
{
int index = j.get<int>();
if( index >= 0 && index < (int) choice->GetCount() )
choice->SetSelection( index );
}
}
else if( wxCheckBox* check = dynamic_cast<wxCheckBox*>( win ) )
{
@ -541,7 +551,12 @@ void DIALOG_SHIM::LoadControlState()
else if( wxRadioBox* radioBox = dynamic_cast<wxRadioBox*>( win ) )
{
if( j.is_number_integer() )
radioBox->SetSelection( j.get<int>() );
{
int index = j.get<int>();
if( index >= 0 && index < (int) radioBox->GetCount() )
radioBox->SetSelection( index );
}
}
else if( wxSplitterWindow* splitter = dynamic_cast<wxSplitterWindow*>( win ) )
{

Write Preview
Loading…
Cancel
Save