NO-OP; Backport changes from Mixbus branch

[ardour.git] / gtk2_ardour / window_manager.h

diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h
index bc4baee18e3e89db369203cb8808411f2eb089d3..9d0363eba9b8fb9d53753c909f83149e4c528ef2 100644 (file)
--- a/gtk2_ardour/window_manager.h
+++ b/gtk2_ardour/window_manager.h
@@ -71,37 +71,40 @@ class Manager : public ARDOUR::SessionHandlePtr
        Windows _windows;
        Glib::RefPtr<Gtk::ActionGroup> window_actions;
        Gtk::Window* current_transient_parent;
-       
+
        Manager();
        ~Manager();
 
        static Manager* _instance;
+  private:
+       void window_proxy_was_mapped (ProxyBase*);
+       void window_proxy_was_unmapped (ProxyBase*);
 };
-       
+
 class ProxyBase : public ARDOUR::SessionHandlePtr, public Gtkmm2ext::WindowProxy
 {
   public:
        ProxyBase (const std::string& name, const std::string& menu_name);
        ProxyBase (const std::string& name, const std::string& menu_name, const XMLNode&);
-       
+
        virtual ARDOUR::SessionHandlePtr* session_handle () = 0;
 
   protected:
        void setup ();
 };
-       
+
 class ProxyTemporary: public ProxyBase
 {
   public:
        ProxyTemporary (const std::string& name, Gtk::Window* win);
        ~ProxyTemporary();
-    
-       Gtk::Window* get (bool create = false) { 
+
+       Gtk::Window* get (bool create = false) {
                (void) create;
                return _window;
        }
-    
-       Gtk::Window* operator->() { 
+
+       Gtk::Window* operator->() {
                return _window;
        }
 
@@ -114,11 +117,11 @@ class ProxyWithConstructor: public ProxyBase
   public:
        ProxyWithConstructor (const std::string& name, const std::string& menu_name, const boost::function<T*()>& c)
                : ProxyBase (name, menu_name) , creator (c) {}
-       
+
        ProxyWithConstructor (const std::string& name, const std::string& menu_name, const boost::function<T*()>& c, const XMLNode* node)
                : ProxyBase (name, menu_name, *node) , creator (c) {}
-       
-       Gtk::Window* get (bool create = false) { 
+
+       Gtk::Window* get (bool create = false) {
                if (!_window) {
                        if (!create) {
                                return 0;
@@ -128,13 +131,13 @@ class ProxyWithConstructor: public ProxyBase
 
                        if (_window) {
                                setup ();
-                       }       
+                       }
                }
 
                return _window;
        }
 
-       T* operator->() { 
+       T* operator->() {
                return dynamic_cast<T*> (get (true));
        }
 
@@ -165,8 +168,8 @@ class Proxy : public ProxyBase
 
        Proxy (const std::string& name, const std::string& menu_name, const XMLNode* node)
                : ProxyBase (name, menu_name, *node)  {}
-       
-       Gtk::Window* get (bool create = false) { 
+
+       Gtk::Window* get (bool create = false) {
                if (!_window) {
                        if (!create) {
                                return 0;
@@ -176,13 +179,13 @@ class Proxy : public ProxyBase
 
                        if (_window) {
                                setup ();
-                       }       
+                       }
                }
 
                return _window;
        }
 
-       T* operator->() { 
+       T* operator->() {
                return dynamic_cast<T*> (get(true));
        }
 
@@ -190,7 +193,7 @@ class Proxy : public ProxyBase
                /* may return null */
                return dynamic_cast<T*> (_window);
        }
-       
+
        void set_session(ARDOUR::Session *s) {
                SessionHandlePtr::set_session (s);
                ARDOUR::SessionHandlePtr* sp = session_handle ();
@@ -199,7 +202,7 @@ class Proxy : public ProxyBase
                        dynamic_cast<T*>(_window)->set_session(s);
                }
        }
-       
+
   private:
        boost::function<T*()>   creator;
 };