use newly factored canvas in gtk2_ardour

[ardour.git] / gtk2_ardour / step_entry.cc

diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc
index 8c26e1d20ee98c4ea35f4665c6b5164a0c1e1341..fd53fd55ff3704fb912c8514ab9a8f644389387a 100644 (file)
--- a/gtk2_ardour/step_entry.cc
+++ b/gtk2_ardour/step_entry.cc
@@ -19,7 +19,6 @@
 
 #include <iostream>
 
-#include "pbd/filesystem.h"
 #include "pbd/file_utils.h"
 
 #include "gtkmm2ext/keyboard.h"
@@ -57,7 +56,7 @@ _rest_event_handler (GtkWidget* /*widget*/, gpointer arg)
 }
 
 StepEntry::StepEntry (StepEditor& seditor)
-       : ArdourDialog (string_compose (_("Step Entry: %1"), seditor.name()))
+       : ArdourWindow (string_compose (_("Step Entry: %1"), seditor.name()))
         , _current_note_length (1.0)
         , _current_note_velocity (64)
        , triplet_button ("3")
@@ -458,7 +457,7 @@ StepEntry::StepEntry (StepEditor& seditor)
        packer.pack_start (*piano, false, false);
        packer.show_all ();
 
-       get_vbox()->add (packer);
+       add (packer);
 
        /* initial settings: quarter note and mezzo forte */
 
@@ -574,7 +573,7 @@ StepEntry::note_off_event_handler (int note)
 void
 StepEntry::on_show ()
 {
-       ArdourDialog::on_show ();
+       ArdourWindow::on_show ();
        //piano->grab_focus ();
 }
 
@@ -708,11 +707,10 @@ StepEntry::load_bindings ()
 
         bindings.set_action_map (myactions);
 
-       sys::path binding_file;
-       SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
+       std::string binding_file;
 
-       if (find_file_in_search_path (spath, "step_editing.bindings", binding_file)) {
-                bindings.load (binding_file.to_string());
+       if (find_file_in_search_path (ardour_config_search_path(), "step_editing.bindings", binding_file)) {
+                bindings.load (binding_file);
         }
 }