remove Gtkmm2ext::possibly_translate_mod_to_make_legal_accelerator().

This is no longer needed because we can set the modifier to the actual bits that GTK uses for Command (META+MOD2)

2 files changed, 0 insertions, 25 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index 43baf5980b..5e95a52229 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -123,7 +123,6 @@ namespace Gtkmm2ext {
 	LIBGTKMM2EXT_API Glib::RefPtr<Gdk::Window> window_to_draw_on (Gtk::Widget& w, Gtk::Widget** parent);
 
         LIBGTKMM2EXT_API bool possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval);
-        LIBGTKMM2EXT_API bool possibly_translate_mod_to_make_legal_accelerator (GdkModifierType& mod);
         LIBGTKMM2EXT_API uint32_t possibly_translate_legal_accelerator_to_real_key (uint32_t keyval);
 
         LIBGTKMM2EXT_API int physical_screen_height (Glib::RefPtr<Gdk::Window>);
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index a7790e6775..7fed1b8aee 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -382,30 +382,6 @@ Gtkmm2ext::detach_menu (Gtk::Menu& menu)
 }
 
 bool
-Gtkmm2ext::possibly_translate_mod_to_make_legal_accelerator (GdkModifierType& mod)
-{
-#ifdef GTKOSX
-	/* GTK on OS X is currently (February 2012) setting both
-	   the Meta and Mod2 bits in the event modifier state if
-	   the Command key is down.
-
-	   gtk_accel_groups_activate() does not invoke any of the logic
-	   that gtk_window_activate_key() will that sorts out that stupid
-	   state of affairs, and as a result it fails to find a match
-	   for the key event and the current set of accelerators.
-
-	   to fix this, if the meta bit is set, remove the mod2 bit
-	   from the modifier. this assumes that our bindings use Primary
-	   which will have set the meta bit in the accelerator entry.
-	*/
-	if (mod & GDK_META_MASK) {
-		mod = GdkModifierType (mod & ~GDK_MOD2_MASK);
-	}
-#endif
-	return true;
-}
-
-bool
 Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval)
 {
 	int fakekey = GDK_VoidSymbol;