diff options
Diffstat (limited to 'libs')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/window_proxy.h | 1 | ||||
-rw-r--r-- | libs/gtkmm2ext/window_proxy.cc | 13 | ||||
-rw-r--r-- | libs/widgets/tabbable.cc | 4 | ||||
-rw-r--r-- | libs/widgets/widgets/tabbable.h | 2 |
4 files changed, 3 insertions, 17 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/window_proxy.h b/libs/gtkmm2ext/gtkmm2ext/window_proxy.h index 13d3d1530f..04dd248353 100644 --- a/libs/gtkmm2ext/gtkmm2ext/window_proxy.h +++ b/libs/gtkmm2ext/gtkmm2ext/window_proxy.h @@ -40,7 +40,6 @@ class VisibilityTracker; class LIBGTKMM2EXT_API WindowProxy : public PBD::StatefulDestructible, public virtual sigc::trackable { public: - WindowProxy (const std::string& name); WindowProxy (const std::string& name, const std::string& menu_name); WindowProxy (const std::string& name, const std::string& menu_name, const XMLNode&); virtual ~WindowProxy(); diff --git a/libs/gtkmm2ext/window_proxy.cc b/libs/gtkmm2ext/window_proxy.cc index 1635f033e1..6e3191abd8 100644 --- a/libs/gtkmm2ext/window_proxy.cc +++ b/libs/gtkmm2ext/window_proxy.cc @@ -31,19 +31,6 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace PBD; -WindowProxy::WindowProxy (const std::string& name) - : _name (name) - , _window (0) - , _visible (false) - , _x_off (-1) - , _y_off (-1) - , _width (-1) - , _height (-1) - , vistracker (0) - , _state_mask (StateMask (Position|Size)) -{ -} - WindowProxy::WindowProxy (const std::string& name, const std::string& menu_name) : _name (name) , _menu_name (menu_name) diff --git a/libs/widgets/tabbable.cc b/libs/widgets/tabbable.cc index 537751d315..fee22bd435 100644 --- a/libs/widgets/tabbable.cc +++ b/libs/widgets/tabbable.cc @@ -37,8 +37,8 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace ArdourWidgets; -Tabbable::Tabbable (Widget& w, const string& name, bool tabbed_by_default) - : WindowProxy (name) +Tabbable::Tabbable (Widget& w, const string& visible_name, string const & nontranslatable_name, bool tabbed_by_default) + : WindowProxy (visible_name, nontranslatable_name) , _contents (w) , _parent_notebook (0) , tab_requested_by_state (tabbed_by_default) diff --git a/libs/widgets/widgets/tabbable.h b/libs/widgets/widgets/tabbable.h index f194485517..af2ced6e27 100644 --- a/libs/widgets/widgets/tabbable.h +++ b/libs/widgets/widgets/tabbable.h @@ -44,7 +44,7 @@ namespace ArdourWidgets { class LIBWIDGETS_API Tabbable : public Gtkmm2ext::WindowProxy { public: - Tabbable (Gtk::Widget&, const std::string&, bool tabbed_by_default = true); + Tabbable (Gtk::Widget&, const std::string& user_visible_name, std::string const & untranslated_name, bool tabbed_by_default = true); ~Tabbable (); void add_to_notebook (Gtk::Notebook& notebook, const std::string& tab_title); |