Remove 'pipex' from my pbd.vcproj as it's not needed for Ardour3

[ardour.git] / gtk2_ardour / keyeditor.cc

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 055a9bcae06cb806a4f4a039e617f7f04fa40094..f23e24695888cb937f51fa5c663747c2b382478d 100644 (file)
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -23,8 +23,6 @@
 
 #include <map>
 
-#include "ardour/profile.h"
-
 #include <gtkmm/stock.h>
 #include <gtkmm/label.h>
 #include <gtkmm/accelkey.h>
@@ -34,7 +32,6 @@
 #include "gtkmm2ext/utils.h"
 
 #include "pbd/strsplit.h"
-#include "pbd/replace_all.h"
 
 #include "ardour/profile.h"
 
@@ -79,7 +76,10 @@ KeyEditor::KeyEditor ()
        scroller.add (view);
        scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 
-       add (scroller);
+       add (vpacker);
+
+       vpacker.set_spacing (6);
+       vpacker.pack_start (scroller);
 
        if (!ARDOUR::Profile->get_sae()) {
 
@@ -90,14 +90,17 @@ KeyEditor::KeyEditor ()
                unbind_box.pack_start (unbind_button, false, false);
                unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind));
 
-               add (unbind_box);
+               vpacker.pack_start (unbind_box, false, false);
                unbind_box.show ();
                unbind_button.show ();
 
        }
 
+       vpacker.set_border_width (12);
+
        view.show ();
        scroller.show ();
+       vpacker.show ();
 
        unbind_button.set_sensitive (false);
 }
@@ -247,8 +250,6 @@ KeyEditor::populate ()
                //kinda kludgy way to avoid displaying menu items as mappable
                if ( parts[1] == _("Main_menu") )
                        continue;
-               if ( parts[1] == _("JACK") )
-                       continue;
                if ( parts[1] == _("redirectmenu") )
                        continue;
                if ( parts[1] == _("Editor_menus") )