projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file binary compat is for windows in general (not msvc)
[ardour.git]
/
gtk2_ardour
/
ardour_dialog.cc
diff --git
a/gtk2_ardour/ardour_dialog.cc
b/gtk2_ardour/ardour_dialog.cc
index c8a25f187471895575b7a0c213fa10b40808d864..34027ca0c3600f3f207e2b460034234a15662389 100644
(file)
--- a/
gtk2_ardour/ardour_dialog.cc
+++ b/
gtk2_ardour/ardour_dialog.cc
@@
-27,13
+27,16
@@
#include "keyboard.h"
#include "splash.h"
#include "utils.h"
#include "keyboard.h"
#include "splash.h"
#include "utils.h"
+#include "window_manager.h"
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
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 ();
@@
-57,12
+60,16
@@
ArdourDialog::~ArdourDialog ()
spl->pop_front();
}
}
spl->pop_front();
}
}
+ WM::Manager::instance().remove (proxy);
}
bool
ArdourDialog::on_key_press_event (GdkEventKey* ev)
{
}
bool
ArdourDialog::on_key_press_event (GdkEventKey* ev)
{
- return relay_key_press (ev, this);
+ if (!relay_key_press (ev, this)) {
+ return Gtk::Window::on_key_press_event(ev);
+ }
+ return true;
}
bool
}
bool
@@
-115,11
+122,14
@@
ArdourDialog::init ()
set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
- Gtk::Window* parent = W
indow
Manager::instance().transient_parent();
+ Gtk::Window* parent = W
M::
Manager::instance().transient_parent();
if (parent) {
set_transient_for (*parent);
}
ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
if (parent) {
set_transient_for (*parent);
}
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);
}
}