X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Fio_selector.cc;h=574b3cd0ca23897dd02bc09c6ece99c846e2a9ba;hb=01251e7e14bba0b4604618ccfad87361e32dac18;hp=19f25dcf1cbfc07f06a4e8547c8affcac56b6042;hpb=78237f3ac3a7918417cd11b30d25c4afdf9b2108;p=ardour.git

diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 19f25dcf1c..574b3cd0ca 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -17,21 +17,18 @@
 
 */
 
+#include <stdint.h>
+
 #include <glibmm/objectbase.h>
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/port_insert.h"
-#include "ardour/session.h"
-#include "ardour/io.h"
 #include "ardour/audioengine.h"
-#include "ardour/track.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
-#include "ardour/mtdm.h"
+#include "ardour/bundle.h"
 #include "ardour/data_type.h"
+#include "ardour/io.h"
 #include "ardour/port.h"
-#include "ardour/bundle.h"
+#include "ardour/session.h"
 
 #include "io_selector.h"
 #include "utils.h"
@@ -39,6 +36,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace Gtk;
 
 IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io)
@@ -207,13 +205,13 @@ IOSelector::list_is_global (int dim) const
 	return (dim == _other);
 }
 
-string
+std::string
 IOSelector::disassociation_verb () const
 {
 	return _("Disconnect");
 }
 
-string
+std::string
 IOSelector::channel_noun () const
 {
 	return _("port");
@@ -227,8 +225,6 @@ IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<
 
 	add (_selector);
 
-	set_position (Gtk::WIN_POS_MOUSE);
-
 	io_name_changed (this);
 
 	show_all ();
@@ -240,8 +236,7 @@ bool
 IOSelectorWindow::wm_delete (GdkEventAny* /*event*/)
 {
 	_selector.Finished (IOSelector::Accepted);
-	hide ();
-	return true;
+	return false;
 }
 
 
@@ -256,7 +251,7 @@ void
 IOSelectorWindow::on_show ()
 {
 	Gtk::Window::on_show ();
-	pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
+	std::pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
 	resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
 }
 
@@ -265,7 +260,7 @@ IOSelectorWindow::io_name_changed (void*)
 {
 	ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src)
 
-	string title;
+	std::string title;
 
 	if (!_selector.find_inputs_for_io_outputs()) {
 		title = string_compose(_("%1 input"), _selector.io()->name());