merge new symmetric curve from mixbus, fix errors in fade out slow curve, tweak displ...

[ardour.git] / gtk2_ardour / window_proxy.cc

diff --git a/gtk2_ardour/window_proxy.cc b/gtk2_ardour/window_proxy.cc
index c37fd0e0432d5a4f917659257f6ceb6d1e8606e2..99da166af00db4e13c14ac7f3dc02b606d727eba 100755 (executable)
--- a/gtk2_ardour/window_proxy.cc
+++ b/gtk2_ardour/window_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010 Paul Davis 
+    Copyright (C) 2010 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
@@ -20,6 +20,10 @@
 #include <gtkmm/window.h>
 #include "window_proxy.h"
 
+#include "pbd/convert.h"
+
+#include "i18n.h"
+
 using namespace std;
 
 /** WindowProxyBase constructor.
@@ -38,7 +42,7 @@ WindowProxyBase::WindowProxyBase (string const & name, XMLNode const * node)
        if (!node) {
                return;
        }
-       
+
        XMLNodeList children = node->children ();
 
        XMLNodeList::const_iterator i = children.begin ();
@@ -47,7 +51,7 @@ WindowProxyBase::WindowProxyBase (string const & name, XMLNode const * node)
                if ((*i)->name() == X_("Window") && prop && prop->value() == _name) {
                        break;
                }
-               
+
                ++i;
        }
 
@@ -56,9 +60,9 @@ WindowProxyBase::WindowProxyBase (string const & name, XMLNode const * node)
                XMLProperty* prop;
 
                if ((prop = (*i)->property (X_("visible"))) != 0) {
-                       _visible = string_is_affirmative (prop->value ());
+                       _visible = PBD::string_is_affirmative (prop->value ());
                }
-               
+
                if ((prop = (*i)->property (X_("x-off"))) != 0) {
                        _x_off = atoi (prop->value().c_str());
                }
@@ -115,7 +119,7 @@ WindowProxyBase::get_state () const
        /* If the window has been created, get its current state; otherwise use
           the state that we started off with.
        */
-       
+
        Gtk::Window* gtk_window = get_gtk_window ();
        if (gtk_window) {
                v = gtk_window->is_visible ();