projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check master sources when determining whether a region uses a source. should fix...
[ardour.git]
/
gtk2_ardour
/
ardour_dialog.cc
diff --git
a/gtk2_ardour/ardour_dialog.cc
b/gtk2_ardour/ardour_dialog.cc
index cd7d0fbd55bbeacd1425db04f6342b6a1d32e6bb..3690ee023bbe545fa7cb59016f478f0507ad5adc 100644
(file)
--- a/
gtk2_ardour/ardour_dialog.cc
+++ b/
gtk2_ardour/ardour_dialog.cc
@@
-26,6
+26,8
@@
#include "ardour_ui.h"
#include "keyboard.h"
#include "splash.h"
#include "ardour_ui.h"
#include "keyboard.h"
#include "splash.h"
+#include "utils.h"
+#include "window_manager.h"
using namespace std;
using namespace Gtk;
using namespace std;
using namespace Gtk;
@@
-33,6
+35,7
@@
using namespace Gtkmm2ext;
ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
: Dialog (title, modal, use_seperator)
ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
: Dialog (title, modal, use_seperator)
+ , proxy (0)
, _splash_pushed (false)
{
init ();
, _splash_pushed (false)
{
init ();
@@
-56,6
+59,13
@@
ArdourDialog::~ArdourDialog ()
spl->pop_front();
}
}
spl->pop_front();
}
}
+ WM::Manager::instance().remove (proxy);
+}
+
+bool
+ArdourDialog::on_key_press_event (GdkEventKey* ev)
+{
+ return relay_key_press (ev, this);
}
bool
}
bool
@@
-94,10
+104,28
@@
ArdourDialog::on_show ()
}
}
}
}
+bool
+ArdourDialog::on_delete_event (GdkEventAny*)
+{
+ hide ();
+ return false;
+}
+
void
ArdourDialog::init ()
{
set_border_width (10);
void
ArdourDialog::init ()
{
set_border_width (10);
- // set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+
+ set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+
+ Gtk::Window* parent = WM::Manager::instance().transient_parent();
+
+ if (parent) {
+ set_transient_for (*parent);
+ }
+
ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
+
+ proxy = new WM::ProxyTemporary (get_title(), this);
+ WM::Manager::instance().register_window (proxy);
}
}