diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp index 62a3d58c8a..820985df26 100644 --- a/src/common/accelcmn.cpp +++ b/src/common/accelcmn.cpp @@ -45,43 +45,43 @@ static const struct wxKeyName const char *display_name; } wxKeyNames[] = { - { WXK_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Delete"), /*Display is the same as key name*/ 0 }, - { WXK_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Del"), /*Display is the same as key name*/ 0 }, + { WXK_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Delete") }, + { WXK_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Del") }, { WXK_BACK, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Back"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Backspace") }, - { WXK_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Insert"), /*Display is the same as key name*/ 0 }, - { WXK_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Ins"), /*Display is the same as key name*/ 0 }, - { WXK_RETURN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Enter"), /*Display is the same as key name*/ 0 }, - { WXK_RETURN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Return"), /*Display is the same as key name*/ 0 }, + { WXK_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Insert") }, + { WXK_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Ins") }, + { WXK_RETURN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Enter") }, + { WXK_RETURN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Return") }, { WXK_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PageUp"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Page Up") }, { WXK_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PageDown"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Page Down") }, - { WXK_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PgUp"), /*Display is the same as key name*/ 0 }, - { WXK_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PgDn"), /*Display is the same as key name*/ 0 }, + { WXK_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PgUp") }, + { WXK_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PgDn") }, { WXK_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Left"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Left") }, { WXK_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Right"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Right") }, { WXK_UP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Up"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Up") }, { WXK_DOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Down"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Down") }, - { WXK_HOME, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Home"), /*Display is the same as key name*/ 0 }, - { WXK_END, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("End"), /*Display is the same as key name*/ 0 }, - { WXK_SPACE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Space"), /*Display is the same as key name*/ 0 }, - { WXK_TAB, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Tab"), /*Display is the same as key name*/ 0 }, - { WXK_ESCAPE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Esc"), /*Display is the same as key name*/ 0 }, - { WXK_ESCAPE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Escape"), /*Display is the same as key name*/ 0 }, - { WXK_CANCEL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Cancel"), /*Display is the same as key name*/ 0 }, - { WXK_CLEAR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Clear"), /*Display is the same as key name*/ 0 }, - { WXK_MENU, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Menu"), /*Display is the same as key name*/ 0 }, - { WXK_PAUSE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Pause"), /*Display is the same as key name*/ 0 }, - { WXK_CAPITAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Capital"), /*Display is the same as key name*/ 0 }, - { WXK_SELECT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Select"), /*Display is the same as key name*/ 0 }, - { WXK_PRINT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Print"), /*Display is the same as key name*/ 0 }, - { WXK_EXECUTE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Execute"), /*Display is the same as key name*/ 0 }, - { WXK_SNAPSHOT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Snapshot"), /*Display is the same as key name*/ 0 }, - { WXK_HELP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Help"), /*Display is the same as key name*/ 0 }, - { WXK_ADD, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Add"), /*Display is the same as key name*/ 0 }, - { WXK_SEPARATOR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Separator"), /*Display is the same as key name*/ 0 }, - { WXK_SUBTRACT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Subtract"), /*Display is the same as key name*/ 0 }, - { WXK_DECIMAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Decimal"), /*Display is the same as key name*/ 0 }, - { WXK_MULTIPLY, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Multiply"), /*Display is the same as key name*/ 0 }, - { WXK_DIVIDE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Divide"), /*Display is the same as key name*/ 0 }, + { WXK_HOME, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Home") }, + { WXK_END, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("End") }, + { WXK_SPACE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Space") }, + { WXK_TAB, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Tab") }, + { WXK_ESCAPE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Esc") }, + { WXK_ESCAPE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Escape") }, + { WXK_CANCEL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Cancel") }, + { WXK_CLEAR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Clear") }, + { WXK_MENU, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Menu") }, + { WXK_PAUSE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Pause") }, + { WXK_CAPITAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Capital") }, + { WXK_SELECT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Select") }, + { WXK_PRINT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Print") }, + { WXK_EXECUTE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Execute") }, + { WXK_SNAPSHOT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Snapshot") }, + { WXK_HELP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Help") }, + { WXK_ADD, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Add") }, + { WXK_SEPARATOR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Separator") }, + { WXK_SUBTRACT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Subtract") }, + { WXK_DECIMAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Decimal") }, + { WXK_MULTIPLY, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Multiply") }, + { WXK_DIVIDE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Divide") }, { WXK_NUMLOCK, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num_lock"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Lock") }, { WXK_SCROLL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Scroll_lock"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Scroll Lock") }, { WXK_NUMPAD_SPACE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Space"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Space") }, @@ -94,8 +94,8 @@ static const struct wxKeyName { WXK_NUMPAD_DOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Down"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Down") }, { WXK_NUMPAD_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_PageUp"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Page Up") }, { WXK_NUMPAD_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_PageDown"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Page Down") }, - { WXK_NUMPAD_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Prior"), /*Display is the same as key name*/ 0 }, - { WXK_NUMPAD_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Next"), /*Display is the same as key name*/ 0 }, + { WXK_NUMPAD_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Prior") }, + { WXK_NUMPAD_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Next") }, { WXK_NUMPAD_END, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_End"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num End") }, { WXK_NUMPAD_BEGIN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Begin"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Begin") }, { WXK_NUMPAD_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Insert"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Insert") }, @@ -107,10 +107,10 @@ static const struct wxKeyName { WXK_NUMPAD_SUBTRACT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Subtract"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num -") }, { WXK_NUMPAD_DECIMAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Decimal"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num .") }, { WXK_NUMPAD_DIVIDE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Divide"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num /") }, - { WXK_WINDOWS_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Left"), /*Display is the same as key name*/ 0 }, - { WXK_WINDOWS_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Right"), /*Display is the same as key name*/ 0 }, - { WXK_WINDOWS_MENU, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Menu"), /*Display is the same as key name*/ 0 }, - { WXK_COMMAND, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Command"), /*Display is the same as key name*/ 0 }, + { WXK_WINDOWS_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Left") }, + { WXK_WINDOWS_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Right") }, + { WXK_WINDOWS_MENU, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Menu") }, + { WXK_COMMAND, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Command") }, }; diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index d0f884e031..67c2d902ca 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -674,7 +674,7 @@ void wxMenuItem::SetGtkLabel() else { // Remove the accelerator since it couldn't be made or is invalid - m_text = m_text.BeforeFirst( wxT( '\t' ) ); + m_text = m_text.BeforeFirst( wxS( '\t' ) ); } #endif // wxUSE_ACCEL } @@ -1059,25 +1059,25 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) hotkey << wxT("Delete" ); break; case WXK_UP: - if( flags ) + if ( flags ) hotkey << wxT("Up" ); else wxFAIL_MSG( wxT("The Up key must have modifiers to be an accelerator key") ); break; case WXK_DOWN: - if( flags ) + if ( flags ) hotkey << wxT("Down" ); else wxFAIL_MSG( wxT("The Down key must have modifiers to be an accelerator key") ); break; case WXK_LEFT: - if( flags ) + if ( flags ) hotkey << wxT("Left" ); else wxFAIL_MSG( wxT("The Left key must have modifiers to be an accelerator key") ); break; case WXK_RIGHT: - if( flags ) + if ( flags ) hotkey << wxT("Right" ); else wxFAIL_MSG( wxT("The Right key must have modifiers to be an accelerator key") ); @@ -1153,25 +1153,25 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) hotkey << wxT("KP_Home" ); break; case WXK_NUMPAD_UP: - if( flags ) + if ( flags ) hotkey << wxT("KP_Up" ); else wxFAIL_MSG( wxT("The KP_Up key must have modifiers to be an accelerator key") ); break; case WXK_NUMPAD_DOWN: - if( flags ) + if ( flags ) hotkey << wxT("KP_Down" ); else wxFAIL_MSG( wxT("The KP_Down key must have modifiers to be an accelerator key") ); break; case WXK_NUMPAD_LEFT: - if( flags ) + if ( flags ) hotkey << wxT("KP_Left" ); else wxFAIL_MSG( wxT("The KP_Left key must have modifiers to be an accelerator key") ); break; case WXK_NUMPAD_RIGHT: - if( flags ) + if ( flags ) hotkey << wxT("KP_Right" ); else wxFAIL_MSG( wxT("The KP_Right key must have modifiers to be an accelerator key") ); diff --git a/tests/menu/accelentry.cpp b/tests/menu/accelentry.cpp index 2ea3686a95..a6b9fe2103 100644 --- a/tests/menu/accelentry.cpp +++ b/tests/menu/accelentry.cpp @@ -26,8 +26,8 @@ namespace void CheckAccelEntry(const wxAcceleratorEntry& accel, int keycode, int flags) { - REQUIRE( keycode == accel.GetKeyCode() ); - REQUIRE( flags == accel.GetFlags() ); + CHECK( keycode == accel.GetKeyCode() ); + CHECK( flags == accel.GetFlags() ); } } // anonymous namespace @@ -44,8 +44,8 @@ TEST_CASE( "wxAcceleratorEntry::Create", "[accelentry]" ) { pa = wxAcceleratorEntry::Create("Foo\tCtrl+Z"); - REQUIRE( pa ); - REQUIRE( pa->IsOk() ); + CHECK( pa ); + CHECK( pa->IsOk() ); CheckAccelEntry(*pa, 'Z', wxACCEL_CTRL); } @@ -53,22 +53,22 @@ TEST_CASE( "wxAcceleratorEntry::Create", "[accelentry]" ) { pa = wxAcceleratorEntry::Create("Shift-Q"); - REQUIRE( !pa ); + CHECK( !pa ); } SECTION( "No accelerator key specified" ) { pa = wxAcceleratorEntry::Create("bloordyblop"); - REQUIRE( !pa ); + CHECK( !pa ); } SECTION( "Display name parsing" ) { pa = wxAcceleratorEntry::Create("Test\tBackSpace"); - REQUIRE( pa ); - REQUIRE( pa->IsOk() ); + CHECK( pa ); + CHECK( pa->IsOk() ); CheckAccelEntry(*pa, WXK_BACK, wxACCEL_NORMAL); } } @@ -84,17 +84,17 @@ TEST_CASE( "wxAcceleratorEntry::StringTests", "[accelentry]" ) SECTION( "Create string from key" ) { - REQUIRE( "Alt+X" == a.ToString() ); + CHECK( "Alt+X" == a.ToString() ); } SECTION( "Create from valid string" ) { - REQUIRE( a.FromString("Alt+Shift+F1") ); + CHECK( a.FromString("Alt+Shift+F1") ); CheckAccelEntry(a, WXK_F1, wxACCEL_ALT | wxACCEL_SHIFT); } SECTION( "Create from invalid string" ) { - REQUIRE( !a.FromString("bloordyblop") ); + CHECK( !a.FromString("bloordyblop") ); } } diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp index 3b99aa4be8..2a76f94c38 100644 --- a/tests/menu/menu.cpp +++ b/tests/menu/menu.cpp @@ -611,130 +611,132 @@ void MenuTestCase::Events() namespace { - void verifyAccelAssigned( wxString labelText, int keycode ) - { - wxAcceleratorEntry* entry = wxAcceleratorEntry::Create( labelText ); - REQUIRE( entry ); - REQUIRE( entry->GetKeyCode() == keycode ); - } +void VerifyAccelAssigned( wxString labelText, int keycode ) +{ + wxAcceleratorEntry* entry = wxAcceleratorEntry::Create( labelText ); + + CHECK( entry ); + CHECK( entry->GetKeyCode() == keycode ); +} + +struct key +{ + int keycode; + wxString name; + bool skip; +}; +key modKeys[] = +{ + { wxACCEL_NORMAL, "Normal", false }, + { wxACCEL_CTRL, "Ctrl", false }, + { wxACCEL_SHIFT, "Shift", false }, + { wxACCEL_ALT, "Alt", false } +}; +/* + The keys marked as skip below are not supported as accelerator + keys on GTK. + */ +key specialKeys[] = +{ + { WXK_F1, "WXK_F1", false }, + { WXK_F2, "WXK_F2", false }, + { WXK_F3, "WXK_F3", false }, + { WXK_F4, "WXK_F4", false }, + { WXK_F5, "WXK_F5", false }, + { WXK_F6, "WXK_F6", false }, + { WXK_F7, "WXK_F7", false }, + { WXK_F8, "WXK_F8", false }, + { WXK_F9, "WXK_F9", false }, + { WXK_F10, "WXK_F10", false }, + { WXK_F11, "WXK_F11", false }, + { WXK_F12, "WXK_F12", false }, + { WXK_F13, "WXK_F13", false }, + { WXK_F14, "WXK_F14", false }, + { WXK_F15, "WXK_F15", false }, + { WXK_F16, "WXK_F16", false }, + { WXK_F17, "WXK_F17", false }, + { WXK_F18, "WXK_F18", false }, + { WXK_F19, "WXK_F19", false }, + { WXK_F20, "WXK_F20", false }, + { WXK_F21, "WXK_F21", false }, + { WXK_F22, "WXK_F22", false }, + { WXK_F23, "WXK_F23", false }, + { WXK_F24, "WXK_F24", false }, + { WXK_INSERT, "WXK_INSERT", false }, + { WXK_DELETE, "WXK_DELETE", false }, + { WXK_UP, "WXK_UP", false }, + { WXK_DOWN, "WXK_DOWN", false }, + { WXK_PAGEUP, "WXK_PAGEUP", false }, + { WXK_PAGEDOWN, "WXK_PAGEDOWN", false }, + { WXK_LEFT, "WXK_LEFT", false }, + { WXK_RIGHT, "WXK_RIGHT", false }, + { WXK_HOME, "WXK_HOME", false }, + { WXK_END, "WXK_END", false }, + { WXK_RETURN, "WXK_RETURN", false }, + { WXK_BACK, "WXK_BACK", false }, + { WXK_TAB, "WXK_TAB", true }, + { WXK_ESCAPE, "WXK_ESCAPE", false }, + { WXK_SPACE, "WXK_SPACE", false }, + { WXK_MULTIPLY, "WXK_MULTIPLY", false }, + { WXK_ADD, "WXK_ADD", true }, + { WXK_SEPARATOR, "WXK_SEPARATOR", true }, + { WXK_SUBTRACT, "WXK_SUBTRACT", true }, + { WXK_DECIMAL, "WXK_DECIMAL", true }, + { WXK_DIVIDE, "WXK_DIVIDE", true }, + { WXK_CANCEL, "WXK_CANCEL", false }, + { WXK_CLEAR, "WXK_CLEAR", false }, + { WXK_MENU, "WXK_MENU", false }, + { WXK_PAUSE, "WXK_PAUSE", false }, + { WXK_CAPITAL, "WXK_CAPITAL", true }, + { WXK_SELECT, "WXK_SELECT", false }, + { WXK_PRINT, "WXK_PRINT", false }, + { WXK_EXECUTE, "WXK_EXECUTE", false }, + { WXK_SNAPSHOT, "WXK_SNAPSHOT", true }, + { WXK_HELP, "WXK_HELP", false }, + { WXK_NUMLOCK, "WXK_NUMLOCK", true }, + { WXK_SCROLL, "WXK_SCROLL", true }, + { WXK_NUMPAD_INSERT, "WXK_NUMPAD_INSERT", false }, + { WXK_NUMPAD_DELETE, "WXK_NUMPAD_DELETE", false }, + { WXK_NUMPAD_SPACE, "WXK_NUMPAD_SPACE", false }, + { WXK_NUMPAD_TAB, "WXK_NUMPAD_TAB", true }, + { WXK_NUMPAD_ENTER, "WXK_NUMPAD_ENTER", false }, + { WXK_NUMPAD_F1, "WXK_NUMPAD_F1", false }, + { WXK_NUMPAD_F2, "WXK_NUMPAD_F2", false }, + { WXK_NUMPAD_F3, "WXK_NUMPAD_F3", false }, + { WXK_NUMPAD_F4, "WXK_NUMPAD_F4", false }, + { WXK_NUMPAD_HOME, "WXK_NUMPAD_HOME", false }, + { WXK_NUMPAD_LEFT, "WXK_NUMPAD_LEFT", false }, + { WXK_NUMPAD_UP, "WXK_NUMPAD_UP", false }, + { WXK_NUMPAD_RIGHT, "WXK_NUMPAD_RIGHT", false }, + { WXK_NUMPAD_DOWN, "WXK_NUMPAD_DOWN", false }, + { WXK_NUMPAD_PAGEUP, "WXK_NUMPAD_PAGEUP", false }, + { WXK_NUMPAD_PAGEDOWN, "WXK_NUMPAD_PAGEDOWN", false }, + { WXK_NUMPAD_END, "WXK_NUMPAD_END", false }, + { WXK_NUMPAD_BEGIN, "WXK_NUMPAD_BEGIN", false }, + { WXK_NUMPAD_EQUAL, "WXK_NUMPAD_EQUAL", false }, + { WXK_NUMPAD_MULTIPLY, "WXK_NUMPAD_MULTIPLY", false }, + { WXK_NUMPAD_ADD, "WXK_NUMPAD_ADD", false }, + { WXK_NUMPAD_SEPARATOR, "WXK_NUMPAD_SEPARATOR", false }, + { WXK_NUMPAD_SUBTRACT, "WXK_NUMPAD_SUBTRACT", false }, + { WXK_NUMPAD_DECIMAL, "WXK_NUMPAD_DECIMAL", false }, + { WXK_NUMPAD_DIVIDE, "WXK_NUMPAD_DIVIDE", false }, + { WXK_NUMPAD0, "WXK_NUMPAD0", false }, + { WXK_NUMPAD1, "WXK_NUMPAD1", false }, + { WXK_NUMPAD2, "WXK_NUMPAD2", false }, + { WXK_NUMPAD3, "WXK_NUMPAD3", false }, + { WXK_NUMPAD4, "WXK_NUMPAD4", false }, + { WXK_NUMPAD5, "WXK_NUMPAD5", false }, + { WXK_NUMPAD6, "WXK_NUMPAD6", false }, + { WXK_NUMPAD7, "WXK_NUMPAD7", false }, + { WXK_NUMPAD8, "WXK_NUMPAD8", false }, + { WXK_NUMPAD9, "WXK_NUMPAD9", false }, + { WXK_WINDOWS_LEFT, "WXK_WINDOWS_LEFT", true }, + { WXK_WINDOWS_RIGHT, "WXK_WINDOWS_RIGHT", true }, + { WXK_WINDOWS_MENU, "WXK_WINDOWS_MENU", false }, + { WXK_COMMAND, "WXK_COMMAND", true } +}; - struct key - { - int keycode; - wxString name; - bool skip; - }; - key modKeys[] = - { - { wxACCEL_NORMAL, "Normal", false }, - { wxACCEL_CTRL, "Ctrl", false }, - { wxACCEL_SHIFT, "Shift", false }, - { wxACCEL_ALT, "Alt", false } - }; - /* - The keys marked as skip below are not supported as accelerator - keys on GTK. - */ - key specialKeys[] = - { - { WXK_F1, "WXK_F1", false }, - { WXK_F2, "WXK_F2", false }, - { WXK_F3, "WXK_F3", false }, - { WXK_F4, "WXK_F4", false }, - { WXK_F5, "WXK_F5", false }, - { WXK_F6, "WXK_F6", false }, - { WXK_F7, "WXK_F7", false }, - { WXK_F8, "WXK_F8", false }, - { WXK_F9, "WXK_F9", false }, - { WXK_F10, "WXK_F10", false }, - { WXK_F11, "WXK_F11", false }, - { WXK_F12, "WXK_F12", false }, - { WXK_F13, "WXK_F13", false }, - { WXK_F14, "WXK_F14", false }, - { WXK_F15, "WXK_F15", false }, - { WXK_F16, "WXK_F16", false }, - { WXK_F17, "WXK_F17", false }, - { WXK_F18, "WXK_F18", false }, - { WXK_F19, "WXK_F19", false }, - { WXK_F20, "WXK_F20", false }, - { WXK_F21, "WXK_F21", false }, - { WXK_F22, "WXK_F22", false }, - { WXK_F23, "WXK_F23", false }, - { WXK_F24, "WXK_F24", false }, - { WXK_INSERT, "WXK_INSERT", false }, - { WXK_DELETE, "WXK_DELETE", false }, - { WXK_UP, "WXK_UP", false }, - { WXK_DOWN, "WXK_DOWN", false }, - { WXK_PAGEUP, "WXK_PAGEUP", false }, - { WXK_PAGEDOWN, "WXK_PAGEDOWN", false }, - { WXK_LEFT, "WXK_LEFT", false }, - { WXK_RIGHT, "WXK_RIGHT", false }, - { WXK_HOME, "WXK_HOME", false }, - { WXK_END, "WXK_END", false }, - { WXK_RETURN, "WXK_RETURN", false }, - { WXK_BACK, "WXK_BACK", false }, - { WXK_TAB, "WXK_TAB", true }, - { WXK_ESCAPE, "WXK_ESCAPE", false }, - { WXK_SPACE, "WXK_SPACE", false }, - { WXK_MULTIPLY, "WXK_MULTIPLY", false }, - { WXK_ADD, "WXK_ADD", true }, - { WXK_SEPARATOR, "WXK_SEPARATOR", true }, - { WXK_SUBTRACT, "WXK_SUBTRACT", true }, - { WXK_DECIMAL, "WXK_DECIMAL", true }, - { WXK_DIVIDE, "WXK_DIVIDE", true }, - { WXK_CANCEL, "WXK_CANCEL", false }, - { WXK_CLEAR, "WXK_CLEAR", false }, - { WXK_MENU, "WXK_MENU", false }, - { WXK_PAUSE, "WXK_PAUSE", false }, - { WXK_CAPITAL, "WXK_CAPITAL", true }, - { WXK_SELECT, "WXK_SELECT", false }, - { WXK_PRINT, "WXK_PRINT", false }, - { WXK_EXECUTE, "WXK_EXECUTE", false }, - { WXK_SNAPSHOT, "WXK_SNAPSHOT", true }, - { WXK_HELP, "WXK_HELP", false }, - { WXK_NUMLOCK, "WXK_NUMLOCK", true }, - { WXK_SCROLL, "WXK_SCROLL", true }, - { WXK_NUMPAD_INSERT, "WXK_NUMPAD_INSERT", false }, - { WXK_NUMPAD_DELETE, "WXK_NUMPAD_DELETE", false }, - { WXK_NUMPAD_SPACE, "WXK_NUMPAD_SPACE", false }, - { WXK_NUMPAD_TAB, "WXK_NUMPAD_TAB", true }, - { WXK_NUMPAD_ENTER, "WXK_NUMPAD_ENTER", false }, - { WXK_NUMPAD_F1, "WXK_NUMPAD_F1", false }, - { WXK_NUMPAD_F2, "WXK_NUMPAD_F2", false }, - { WXK_NUMPAD_F3, "WXK_NUMPAD_F3", false }, - { WXK_NUMPAD_F4, "WXK_NUMPAD_F4", false }, - { WXK_NUMPAD_HOME, "WXK_NUMPAD_HOME", false }, - { WXK_NUMPAD_LEFT, "WXK_NUMPAD_LEFT", false }, - { WXK_NUMPAD_UP, "WXK_NUMPAD_UP", false }, - { WXK_NUMPAD_RIGHT, "WXK_NUMPAD_RIGHT", false }, - { WXK_NUMPAD_DOWN, "WXK_NUMPAD_DOWN", false }, - { WXK_NUMPAD_PAGEUP, "WXK_NUMPAD_PAGEUP", false }, - { WXK_NUMPAD_PAGEDOWN, "WXK_NUMPAD_PAGEDOWN", false }, - { WXK_NUMPAD_END, "WXK_NUMPAD_END", false }, - { WXK_NUMPAD_BEGIN, "WXK_NUMPAD_BEGIN", false }, - { WXK_NUMPAD_EQUAL, "WXK_NUMPAD_EQUAL", false }, - { WXK_NUMPAD_MULTIPLY, "WXK_NUMPAD_MULTIPLY", false }, - { WXK_NUMPAD_ADD, "WXK_NUMPAD_ADD", false }, - { WXK_NUMPAD_SEPARATOR, "WXK_NUMPAD_SEPARATOR", false }, - { WXK_NUMPAD_SUBTRACT, "WXK_NUMPAD_SUBTRACT", false }, - { WXK_NUMPAD_DECIMAL, "WXK_NUMPAD_DECIMAL", false }, - { WXK_NUMPAD_DIVIDE, "WXK_NUMPAD_DIVIDE", false }, - { WXK_NUMPAD0, "WXK_NUMPAD0", false }, - { WXK_NUMPAD1, "WXK_NUMPAD1", false }, - { WXK_NUMPAD2, "WXK_NUMPAD2", false }, - { WXK_NUMPAD3, "WXK_NUMPAD3", false }, - { WXK_NUMPAD4, "WXK_NUMPAD4", false }, - { WXK_NUMPAD5, "WXK_NUMPAD5", false }, - { WXK_NUMPAD6, "WXK_NUMPAD6", false }, - { WXK_NUMPAD7, "WXK_NUMPAD7", false }, - { WXK_NUMPAD8, "WXK_NUMPAD8", false }, - { WXK_NUMPAD9, "WXK_NUMPAD9", false }, - { WXK_WINDOWS_LEFT, "WXK_WINDOWS_LEFT", true }, - { WXK_WINDOWS_RIGHT, "WXK_WINDOWS_RIGHT", true }, - { WXK_WINDOWS_MENU, "WXK_WINDOWS_MENU", false }, - { WXK_COMMAND, "WXK_COMMAND", true } - }; } TEST_CASE( "wxMenuItemAccelEntry", "[menu][accelentry]" ) @@ -746,7 +748,7 @@ TEST_CASE( "wxMenuItemAccelEntry", "[menu][accelentry]" ) SECTION( "Modifier keys" ) { - for( int i = 0; i < WXSIZEOF(modKeys); i++ ) + for ( int i = 0; i < WXSIZEOF(modKeys); i++ ) { const key& k = modKeys[i]; @@ -757,13 +759,13 @@ TEST_CASE( "wxMenuItemAccelEntry", "[menu][accelentry]" ) wxString labelText = item->GetItemLabel(); INFO( wxString::Format( "Label text: %s", labelText ) ); - verifyAccelAssigned( labelText, 'A' ); + VerifyAccelAssigned( labelText, 'A' ); } } SECTION( "Special keys" ) { - for( int i = 0; i < WXSIZEOF(specialKeys); i++ ) + for ( int i = 0; i < WXSIZEOF(specialKeys); i++ ) { const key& k = specialKeys[i]; @@ -777,7 +779,7 @@ TEST_CASE( "wxMenuItemAccelEntry", "[menu][accelentry]" ) wxString labelText = item->GetItemLabel(); INFO( wxString::Format( "Label text: %s", labelText ) ); - verifyAccelAssigned( labelText, k.keycode ); + VerifyAccelAssigned( labelText, k.keycode ); } } }