diff --git a/src/laybasic/laybasic/layAbstractMenu.cc b/src/laybasic/laybasic/layAbstractMenu.cc index 7c24ce749..9e264218d 100644 --- a/src/laybasic/laybasic/layAbstractMenu.cc +++ b/src/laybasic/laybasic/layAbstractMenu.cc @@ -783,7 +783,7 @@ bool Action::is_checked () const { #if defined(HAVE_QT) - return qaction () && qaction ()->isChecked (); + return qaction () ? qaction ()->isChecked () : m_checked; #else return m_checked; #endif @@ -792,7 +792,11 @@ Action::is_checked () const bool Action::is_enabled () const { +#if defined(HAVE_QT) + return qaction () ? qaction ()->isEnabled () : m_enabled; +#else return m_enabled; +#endif } bool diff --git a/testdata/ruby/layMenuTest.rb b/testdata/ruby/layMenuTest.rb index a0135a7bf..256349b09 100644 --- a/testdata/ruby/layMenuTest.rb +++ b/testdata/ruby/layMenuTest.rb @@ -218,7 +218,7 @@ RESULT assert_equal( menu.is_separator?( "file_menu.sep" ), true ) assert_equal( menu.action( "file_menu.#0" ).title, "New title" ) - assert_equal( menu.action( "file_menu.#0" ).shortcut, "Ctrl+Shift+F7" ) + assert_equal( menu.action( "file_menu.#0" ).shortcut, "Shift+Ctrl+F7" ) assert_equal( menu.action( "file_menu.#3" ).icon_text, "X" ) assert_equal( menu.action( "my_menu.new_item" ).is_visible?, true ) assert_equal( menu.action( "file_menu.#3" ).is_checked?, false )