projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proper 1px track separator
[ardour.git]
/
gtk2_ardour
/
ardour_dialog.h
diff --git
a/gtk2_ardour/ardour_dialog.h
b/gtk2_ardour/ardour_dialog.h
index 3384c013d40ae4969e72fadbb1071819619844d4..d994c0a6d110ce37fa23de8b4df6fc574a444579 100644
(file)
--- a/
gtk2_ardour/ardour_dialog.h
+++ b/
gtk2_ardour/ardour_dialog.h
@@
-20,47
+20,38
@@
#ifndef __ardour_dialog_h__
#define __ardour_dialog_h__
#ifndef __ardour_dialog_h__
#define __ardour_dialog_h__
-#include "ardour/ardour.h"
#include <gtkmm/window.h>
#include <gtkmm/dialog.h>
#include <gtkmm/window.h>
#include <gtkmm/dialog.h>
-namespace ARDOUR {
- class Session;
+#include "ardour/session_handle.h"
+
+namespace WM {
+ class ProxyTemporary;
}
/*
* This virtual parent class is so that each dialog box uses the
}
/*
* This virtual parent class is so that each dialog box uses the
- * same mechanism to declare its closing, and to have a common
- * method of connecting and disconnecting from a Session.
+ * same mechanism to declare its closing. It shares a common
+ * method of connecting and disconnecting from a Session with
+ * all other objects that have a handle on a Session.
*/
*/
-class ArdourDialog : public Gtk::Dialog
+class ArdourDialog : public Gtk::Dialog
, public ARDOUR::SessionHandlePtr
{
public:
ArdourDialog (std::string title, bool modal = false, bool use_separator = false);
{
public:
ArdourDialog (std::string title, bool modal = false, bool use_separator = false);
- ArdourDialog (Gtk::Window& parent, std::string title, bool modal = false, bool use_separator = false);
+ ArdourDialog (Gtk::Window& parent, std::string title, bool modal = false, bool use_separator = false);
~ArdourDialog();
~ArdourDialog();
- static int close_all_current_dialogs (int response);
-
- bool on_key_press_event (GdkEventKey *);
bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*);
bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*);
+ bool on_delete_event (GdkEventAny*);
+ bool on_key_press_event (GdkEventKey*);
void on_unmap ();
void on_show ();
void on_unmap ();
void on_show ();
- ARDOUR::Session *session;
-
- virtual void set_session (ARDOUR::Session* s) {
- session = s;
- }
-
- virtual void session_gone () {
- set_session (0);
- }
-
- static void close_all_dialogs () { CloseAllDialogs(); }
-
private:
private:
+ WM::ProxyTemporary* proxy;
+ bool _splash_pushed;
void init ();
static sigc::signal<void> CloseAllDialogs;
void init ();
static sigc::signal<void> CloseAllDialogs;