NOOP, remove trailing tabs/whitespace.

[ardour.git] / gtk2_ardour / window_manager.cc

diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index 4a44dc469166ccf8377239604317e7fdc862e781..b4767879266b40fe84a0583866f0fff086b93653 100644 (file)
--- a/gtk2_ardour/window_manager.cc
+++ b/gtk2_ardour/window_manager.cc
@@ -68,7 +68,7 @@ Manager::register_window (ProxyBase* info)
                        ActionManager::add_action_group (window_actions);
                }
 
-               info->set_action (ActionManager::register_action (window_actions, info->action_name().c_str(), info->menu_name().c_str(), 
+               info->set_action (ActionManager::register_action (window_actions, info->action_name().c_str(), info->menu_name().c_str(),
                                                                  sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)));
        }
 }
@@ -97,6 +97,12 @@ Manager::show_visible() const
 {
        for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) {
                if ((*i)->visible()) {
+                       if (! (*i)->get (true)) {
+                               /* the window may be a plugin GUI for a plugin which
+                                * is disabled or longer present.
+                                */
+                               continue;
+                       }
                        (*i)->show_all ();
                        (*i)->present ();
                }
@@ -136,7 +142,7 @@ Manager::set_transient_for (Gtk::Window* parent)
        /* OS X has a richer concept of window layering than X does (or
         * certainly, than any accepted conventions on X), and so the use of
         * Manager::set_transient_for() is not necessary on that platform.
-        * 
+        *
         * On OS X this is mostly taken care of by using the window type rather
         * than explicit 1:1 transient-for relationships.
         */
@@ -157,7 +163,7 @@ Manager::set_transient_for (Gtk::Window* parent)
                        }
                }
        }
-       
+
        current_transient_parent = parent;
 #endif
 }
@@ -172,7 +178,7 @@ ProxyBase::ProxyBase (const string& name, const std::string& menu_name)
        , _x_off (-1)
        , _y_off (-1)
        , _width (-1)
-       , _height (-1) 
+       , _height (-1)
        , vistracker (0)
 {
 }
@@ -185,7 +191,7 @@ ProxyBase::ProxyBase (const string& name, const std::string& menu_name, const XM
        , _x_off (-1)
        , _y_off (-1)
        , _width (-1)
-       , _height (-1) 
+       , _height (-1)
        , vistracker (0)
 {
        set_state (node);
@@ -249,13 +255,13 @@ ProxyBase::set_action (Glib::RefPtr<Gtk::Action> act)
 }
 
 std::string
-ProxyBase::action_name() const 
+ProxyBase::action_name() const
 {
        return string_compose (X_("toggle-%1"), _name);
 }
 
 void
-ProxyBase::toggle() 
+ProxyBase::toggle()
 {
        if (!_window) {
                (void) get (true);
@@ -294,12 +300,12 @@ XMLNode&
 ProxyBase::get_state () const
 {
        XMLNode* node = new XMLNode (X_("Window"));
-       char buf[32];   
+       char buf[32];
 
        node->add_property (X_("name"), _name);
 
        if (_window && vistracker) {
-               
+
                /* we have a window, so use current state */
 
                _visible = vistracker->partially_visible ();
@@ -310,7 +316,7 @@ ProxyBase::get_state () const
        }
 
        node->add_property (X_("visible"), _visible? X_("yes") : X_("no"));
-       
+
        snprintf (buf, sizeof (buf), "%d", _x_off);
        node->add_property (X_("x-off"), buf);
        snprintf (buf, sizeof (buf), "%d", _y_off);
@@ -349,7 +355,7 @@ ProxyBase::setup ()
        assert (_window);
 
        vistracker = new Gtkmm2ext::VisibilityTracker (*_window);
-       _window->signal_delete_event().connect (sigc::mem_fun (*this, &ProxyBase::handle_win_event));
+       _window->signal_delete_event().connect (sigc::mem_fun (*this, &ProxyBase::delete_event_handler));
 
        if (_width != -1 || _height != -1 || _x_off != -1 || _y_off != -1) {
                /* cancel any mouse-based positioning */
@@ -365,12 +371,13 @@ ProxyBase::setup ()
        }
        set_session(_session);
 }
-       
+
 void
 ProxyBase::show ()
 {
-       Gtk::Window* win = get (true);
-       win->show ();
+       get (true);
+       assert (_window);
+       _window->show ();
 }
 
 void
@@ -384,17 +391,19 @@ ProxyBase::maybe_show ()
 void
 ProxyBase::show_all ()
 {
-       Gtk::Window* win = get (true);
-       win->show_all ();
+       get (true);
+       assert (_window);
+       _window->show_all ();
 }
 
-
 void
 ProxyBase::present ()
 {
-       Gtk::Window* win = get (true);
-       win->show_all ();
-       win->present ();
+       get (true);
+       assert (_window);
+
+       _window->show_all ();
+       _window->present ();
 
        /* turn off any mouse-based positioning */
        _window->set_position (Gtk::WIN_POS_NONE);
@@ -403,15 +412,14 @@ ProxyBase::present ()
 void
 ProxyBase::hide ()
 {
-       Gtk::Window* win = get (false);
-       if (win) {
+       if (_window) {
                save_pos_and_size();
-               win->hide ();
+               _window->hide ();
        }
 }
 
 bool
-ProxyBase::handle_win_event (GdkEventAny* /*ev*/)
+ProxyBase::delete_event_handler (GdkEventAny* /*ev*/)
 {
        hide();
        return true;
@@ -420,10 +428,9 @@ ProxyBase::handle_win_event (GdkEventAny* /*ev*/)
 void
 ProxyBase::save_pos_and_size ()
 {
-       Gtk::Window* win = get (false);
-       if (win) {
-               win->get_position (_x_off, _y_off);
-               win->get_size (_width, _height);
+       if (_window) {
+               _window->get_position (_x_off, _y_off);
+               _window->get_size (_width, _height);
        }
 }
 /*-----------------------*/