cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert new menu unit test to C++98 style

Browse Source
This commit is contained in:
Ian McInerney 2019-08-05 09:14:03 +02:00
parent 942fd47ae8
commit 585302a69b
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/menu/menu.cpp
View File

@ -625,7 +625,7 @@ namespace
wxString name;
bool skip;
};
std::vector<key> modKeys =
key modKeys[] =
{
{ wxACCEL_NORMAL, "Normal", false },
{ wxACCEL_CTRL, "Ctrl", false },
@ -636,7 +636,7 @@ namespace
The keys marked as skip below are not supported as accelerator
keys on GTK.
*/
std::vector<key> specialKeys =
key specialKeys[] =
{
{ WXK_F1, "WXK_F1", false },
{ WXK_F2, "WXK_F2", false },
@ -746,12 +746,12 @@ TEST_CASE( "wxMenuItemAccelEntry", "[menu][accelentry]" )
SECTION( "Modifier keys" )
{
std::vector<key>::iterator k;
for( k = modKeys.begin(); k < modKeys.end(); k++ )
for( int i = 0; i < WXSIZEOF(modKeys); i++ )
{
INFO( wxString::Format( "Modifier: %s", k->name ) );
wxAcceleratorEntry accelEntry( k->keycode, 'A' , wxID_ANY, item );
const key& k = modKeys[i];
INFO( wxString::Format( "Modifier: %s", k.name ) );
wxAcceleratorEntry accelEntry( k.keycode, 'A' , wxID_ANY, item );
item->SetAccel( &accelEntry );
wxString labelText = item->GetItemLabel();
@ -763,21 +763,21 @@ TEST_CASE( "wxMenuItemAccelEntry", "[menu][accelentry]" )
SECTION( "Special keys" )
{
std::vector<key>::iterator k;
for( k = specialKeys.begin(); k < specialKeys.end(); k++ )
for( int i = 0; i < WXSIZEOF(specialKeys); i++ )
{
if( k->skip )
const key& k = specialKeys[i];
if( k.skip )
continue;
INFO( wxString::Format( "Keycode: %s", k->name ) );
wxAcceleratorEntry accelEntry( wxACCEL_CTRL, k->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, k->keycode );
verifyAccelAssigned( labelText, k.keycode );
}
}
}