summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_strip.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-11-19 00:56:35 +0000
committerDavid Robillard <d@drobilla.net>2011-11-19 00:56:35 +0000
commit05283a63398fd7a563480a76802e6b2c2ad2e404 (patch)
treea0906614a0fc132fca8d5c910fdc97f5e694585b /gtk2_ardour/mixer_strip.cc
parenta9fb657a47470c5cb439bca5745d4fec8d16b322 (diff)
Only use ArdourDialog (and thus Gtk::Dialog) for actual dialogs.
Fixes #4364. I havn't fully tested every single dialog and window (heck, I don't even know how to get at half of them), and there may be some packing niggles, but this is the bulk of the work. The Gnome 3 kiddies can close their dialogs now, anyway :) git-svn-id: svn://localhost/ardour2/branches/3.0@10699 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
-rw-r--r--gtk2_ardour/mixer_strip.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 18f65d7880..4442fddb51 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -54,7 +54,7 @@
#include "ardour/port.h"
#include "ardour_ui.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
#include "mixer_strip.h"
#include "mixer_ui.h"
#include "keyboard.h"
@@ -1351,7 +1351,7 @@ MixerStrip::open_comment_editor ()
void
MixerStrip::setup_comment_editor ()
{
- comment_window = new ArdourDialog ("", false); // title will be reset to show route
+ comment_window = new ArdourWindow (""); // title will be reset to show route
comment_window->set_position (Gtk::WIN_POS_MOUSE);
comment_window->set_skip_taskbar_hint (true);
comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
@@ -1364,8 +1364,7 @@ MixerStrip::setup_comment_editor ()
comment_area->get_buffer()->set_text (_route->comment());
comment_area->show ();
- comment_window->get_vbox()->pack_start (*comment_area);
- comment_window->get_action_area()->hide();
+ comment_window->add (*comment_area);
}
void