adjust plugin-UI height when toggling expanders

[ardour.git] / gtk2_ardour / keyboard.cc

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index 734c4ecc0e4193b731745cfbde4f7d400a1c3340..6341071451f94d3b5e99b72169e8405652ff53e2 100644 (file)
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -30,7 +30,7 @@
 #include "opts.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -38,7 +38,7 @@ using namespace PBD;
 using namespace ARDOUR;
 using Gtkmm2ext::Keyboard;
 
-#ifdef GTKOSX
+#ifdef __APPLE__
 guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier;
 #else
 guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier;
@@ -56,11 +56,7 @@ ArdourKeyboard::find_bindings_files (map<string,string>& files)
        vector<std::string> found;
        Searchpath spath = ardour_config_search_path();
 
-       if (getenv ("ARDOUR_SAE")) {
-               find_files_matching_pattern (found, spath, string_compose ("*SAE-*.%1", Keyboard::binding_filename_suffix));
-       } else {
-               find_files_matching_pattern (found, spath, string_compose ("*.%1", Keyboard::binding_filename_suffix));
-       }
+       find_files_matching_pattern (found, spath, string_compose ("*%1", Keyboard::binding_filename_suffix));
 
        if (found.empty()) {
                return;
@@ -99,8 +95,7 @@ ArdourKeyboard::setup_keybindings ()
                binding_files.insert (newpair);
        }
 
-       /* check to see if they gave a style name ("SAE", "ergonomic") or
-          an actual filename (*.bindings)
+       /* check to see if they gave a style name ("ergonomic") or an actual filename (*.bindings)
        */
 
        if (!keybindings_path.empty() && keybindings_path.find (binding_filename_suffix) == string::npos) {
@@ -232,7 +227,7 @@ ArdourKeyboard::get_state (void)
 int
 ArdourKeyboard::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("constraint-modifier")) != 0) {
                sscanf (prop->value().c_str(), "%d", &constraint_mod);