From 2bbbcd5bdbfadbe0d04a74188eaff243a0e92031 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 20 Jan 2010 18:02:17 +0000 Subject: move i18n _() call out of global scope git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6524 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/keyboard.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 005234aa8c..a0d4b1f788 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -72,7 +72,6 @@ guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK; guint Keyboard::button2_modifiers = 0; /* not used */ #endif - Keyboard* Keyboard::_the_keyboard = 0; Gtk::Window* Keyboard::current_window = 0; bool Keyboard::_some_magic_widget_has_focus = false; @@ -81,7 +80,7 @@ std::string Keyboard::user_keybindings_path; bool Keyboard::can_save_keybindings = false; bool Keyboard::bindings_changed_after_save_became_legal = false; map Keyboard::binding_files; -string Keyboard::_current_binding_name = _("Unknown"); +string Keyboard::_current_binding_name; map,Keyboard::AccelKeyLess> Keyboard::release_keys; /* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */ @@ -110,6 +109,7 @@ Keyboard::Keyboard () { if (_the_keyboard == 0) { _the_keyboard = this; + _current_binding_name = _("Unknown"); } RelevantModifierKeyMask = (GdkModifierType) gtk_accelerator_get_default_mod_mask (); -- cgit v1.2.3