next modifier, and remove color 102 since nothing uses it

[ardour.git] / gtk2_ardour / window_manager.h

diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h
index 3a8084089141faba218baf9b2bef0593ae2238b3..2dd6a2262ea8f4db7310d8efafa97c20ee383a0a 100644 (file)
--- a/gtk2_ardour/window_manager.h
+++ b/gtk2_ardour/window_manager.h
@@ -122,7 +122,7 @@ class ProxyBase : public ARDOUR::SessionHandlePtr, public sigc::trackable {
     Gtkmm2ext::VisibilityTracker* vistracker;
 
     void save_pos_and_size ();
-    bool handle_win_event (GdkEventAny *ev);
+    bool delete_event_handler (GdkEventAny *ev);
     
     void setup ();
 };
@@ -151,7 +151,7 @@ class ProxyWithConstructor: public ProxyBase {
            : 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) {}
+           : ProxyBase (name, menu_name, *node) , creator (c) {}
        
     Gtk::Window* get (bool create = false) { 
            if (!_window) {
@@ -159,7 +159,7 @@ class ProxyWithConstructor: public ProxyBase {
                            return 0;
                    }
 
-                   _window = creator ();
+                       _window = dynamic_cast<Gtk::Window*> (creator ());
 
                    if (_window) {
                            setup ();
@@ -198,7 +198,7 @@ class Proxy : public ProxyBase {
            : ProxyBase (name, menu_name) {}
 
     Proxy (const std::string& name, const std::string& menu_name, const XMLNode* node)
-           : ProxyBase (name, menu_name, node)  {}
+           : ProxyBase (name, menu_name, *node)  {}
        
     Gtk::Window* get (bool create = false) { 
            if (!_window) {