summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_tracer.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/midi_tracer.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/midi_tracer.cc')
-rw-r--r--gtk2_ardour/midi_tracer.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc
index 357772c91c..6da5244600 100644
--- a/gtk2_ardour/midi_tracer.cc
+++ b/gtk2_ardour/midi_tracer.cc
@@ -36,7 +36,7 @@ using namespace MIDI;
using namespace Glib;
MidiTracer::MidiTracer ()
- : ArdourDialog (_("MIDI Tracer"))
+ : ArdourWindow (_("MIDI Tracer"))
, parser (0)
, line_count_adjustment (200, 1, 2000, 1, 10)
, line_count_spinner (line_count_adjustment)
@@ -51,10 +51,11 @@ MidiTracer::MidiTracer ()
, base_button (_("Decimal"))
, collect_button (_("Enabled"))
{
- get_vbox()->set_spacing (4);
-
Manager::instance()->PortsChanged.connect (_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context());
+ VBox* vbox = manage (new VBox);
+ vbox->set_spacing (4);
+
HBox* pbox = manage (new HBox);
pbox->set_spacing (6);
pbox->pack_start (*manage (new Label (_("Port:"))), false, false);
@@ -62,11 +63,11 @@ MidiTracer::MidiTracer ()
_port_combo.signal_changed().connect (sigc::mem_fun (*this, &MidiTracer::port_changed));
pbox->pack_start (_port_combo);
pbox->show_all ();
- get_vbox()->pack_start (*pbox, false, false);
+ vbox->pack_start (*pbox, false, false);
scroller.add (text);
- get_vbox()->set_border_width (12);
- get_vbox()->pack_start (scroller, true, true);
+ vbox->set_border_width (12);
+ vbox->pack_start (scroller, true, true);
text.show ();
text.set_name ("MidiTracerTextView");
@@ -85,15 +86,16 @@ MidiTracer::MidiTracer ()
line_count_label.show ();
line_count_box.show ();
- get_action_area()->add (line_count_box);
-
HBox* bbox = manage (new HBox);
+ bbox->add (line_count_box);
bbox->add (base_button);
bbox->add (collect_button);
bbox->add (autoscroll_button);
bbox->show ();
- get_action_area()->add (*bbox);
+ vbox->pack_start (*bbox, false, false);
+
+ add (*vbox);
base_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::base_toggle));
collect_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::collect_toggle));