kill glib-induced abort caused by asymmetric lock/unlock of diskstream state lock

[ardour.git] / gtk2_ardour / ardour_dialog.h

diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h
index becacdccbf0098f3414b5d474a121494888fbb3f..069768c1436b245e66cc69f6cf15f9bfadd77d61 100644 (file)
--- a/gtk2_ardour/ardour_dialog.h
+++ b/gtk2_ardour/ardour_dialog.h
@@ -22,36 +22,26 @@
 
 #include <ardour/ardour.h>
 #include <gtkmm/window.h>
-
-#include "keyboard_target.h"
+#include <gtkmm/dialog.h>
 
 namespace ARDOUR {
        class Session;
-};
+}
 
 /*
  * 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.
  */
-class ArdourDialog : public Gtk::Window, public KeyboardTarget
+class ArdourDialog : public Gtk::Dialog
 {
   public:
-       ArdourDialog (string name);
+       ArdourDialog (std::string title, bool modal = false, bool use_separator = false);
        ~ArdourDialog();
 
-       bool within_hiding() const { return _within_hiding; }
-
-       void run ();
-       void stop (int);
-       void close ();
-       void set_keyboard_input (bool yn);
-       void set_hide_on_stop (bool yn);
-       int  run_status();
-
        bool on_enter_notify_event (GdkEventCrossing*);
        bool on_leave_notify_event (GdkEventCrossing*);
-       bool on_unmap (GdkEventAny *);
+       void on_unmap ();
 
        ARDOUR::Session *session;
 
@@ -62,20 +52,7 @@ class ArdourDialog : public Gtk::Window, public KeyboardTarget
        virtual void session_gone () {
                set_session (0);
        }
-
-       void quit ();
-       void wm_close();
-       void wm_doi ();
-       gint wm_close_event (GdkEventAny *);
-       gint wm_doi_event (GdkEventAny *);
-       gint wm_doi_event_stop (GdkEventAny *);
-
-  private:
-       int  _run_status;
-       bool _within_hiding;
-       bool kbd_input;
-       bool running;
-       bool hide_on_stop;
 };
 
 #endif // __ardour_dialog_h__
+