Reenable the correct sort column and type when redisplaying regions

[ardour.git] / gtk2_ardour / ardour_dialog.h

diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h
index 041b62e1cdfc662f9a2a31b3aec7b9ad2f5f7ecd..53a359e053c31bcca7ddf5356a468d2bf15cbd85 100644 (file)
--- a/gtk2_ardour/ardour_dialog.h
+++ b/gtk2_ardour/ardour_dialog.h
@@ -1,21 +1,23 @@
 /*
-    Copyright (C) 2002 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2005-2006 Taybin Rutkin <taybin@taybin.com>
+ * Copyright (C) 2005-2013 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2008-2011 David Robillard <d@drobilla.net>
+ * Copyright (C) 2017 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __ardour_dialog_h__
 #define __ardour_dialog_h__
@@ -25,6 +27,10 @@
 
 #include "ardour/session_handle.h"
 
+namespace WM {
+       class ProxyTemporary;
+}
+
 /*
  * This virtual parent class is so that each dialog box uses the
  * same mechanism to declare its closing. It shares a common
@@ -33,18 +39,25 @@
  */
 class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr
 {
-  public:
+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();
 
-       bool on_enter_notify_event (GdkEventCrossing*);
-       bool on_leave_notify_event (GdkEventCrossing*);
+       bool on_focus_in_event (GdkEventFocus*);
+       bool on_focus_out_event (GdkEventFocus*);
+       bool on_delete_event (GdkEventAny*);
        void on_unmap ();
        void on_show ();
+       virtual void on_response (int);
+
+protected:
+       void pop_splash ();
+       void close_self ();
 
-  private:
-        bool _splash_pushed;
+private:
+       WM::ProxyTemporary* proxy;
+       bool _splash_pushed;
        void init ();
 
        static sigc::signal<void> CloseAllDialogs;