From ef596283761c563ccf31fbdbcde0c8427cd36d2b Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Mon, 5 Aug 2019 01:16:16 +0200 Subject: [PATCH] Fix CI errors in the unit tests --- tests/menu/menu.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp index 2ce211e525..81596c9117 100644 --- a/tests/menu/menu.cpp +++ b/tests/menu/menu.cpp @@ -746,10 +746,12 @@ TEST_CASE( "wxMenuItemAccelEntry", "[menu][accelentry]" ) SECTION( "Modifier keys" ) { - for( auto key : modKeys ) + std::vector::iterator k; + + for( k = modKeys.begin(); k < modKeys.end(); k++ ) { - INFO( wxString::Format( "Modifier: %s", key.name ) ); - wxAcceleratorEntry accelEntry( key.keycode, 'A' , wxID_ANY, item ); + INFO( wxString::Format( "Modifier: %s", k->name ) ); + wxAcceleratorEntry accelEntry( k->keycode, 'A' , wxID_ANY, item ); item->SetAccel( &accelEntry ); wxString labelText = item->GetItemLabel(); @@ -761,19 +763,21 @@ TEST_CASE( "wxMenuItemAccelEntry", "[menu][accelentry]" ) SECTION( "Special keys" ) { - for( auto key : specialKeys ) + std::vector::iterator k; + + for( k = specialKeys.begin(); k < specialKeys.end(); k++ ) { - if( key.skip ) + if( k->skip ) continue; - INFO( wxString::Format( "Keycode: %s", key.name ) ); - wxAcceleratorEntry accelEntry( wxACCEL_CTRL, key.keycode, wxID_ANY, item ); + INFO( wxString::Format( "Keycode: %s", k->name ) ); + wxAcceleratorEntry accelEntry( wxACCEL_CTRL, k->keycode, wxID_ANY, item ); item->SetAccel( &accelEntry ); wxString labelText = item->GetItemLabel(); INFO( wxString::Format( "Label text: %s", labelText ) ); - verifyAccelAssigned( labelText, key.keycode ); + verifyAccelAssigned( labelText, k->keycode ); } } }