more miscellaneous fixes to make things even nicer

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e8aaee5b99e116d476a374d3aa81690af31f0429..62655bff130bc01c4c54fb22d5693e5e04839057 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -66,6 +66,7 @@
 #include "crossfade_edit.h"
 #include "audio_time_axis.h"
 #include "canvas_impl.h"
+#include "actions.h"
 #include "gui_thread.h"
 
 #include "i18n.h"
@@ -679,6 +680,7 @@ Editor::Editor (AudioEngine& eng)
        global_hpacker.pack_start (global_vpacker, true, true);
 
        set_name ("EditorWindow");
+       add_accel_group (ActionManager::ui_manager->get_accel_group());
 
        vpacker.pack_end (global_hpacker, true, true);
        
@@ -796,7 +798,8 @@ void
 Editor::show_window ()
 {
        show_all ();
-       
+       present ();
+
        /* now reset all audio_time_axis heights, because widgets might need
           to be re-hidden
        */
@@ -4097,9 +4100,3 @@ Editor::transport_punch_location()
                return 0;
        }
 }
-
-void 
-Editor::on_map ()
-{
-       // XXX remove me
-}