From 2b0adc8f751e3639407908300a14d6dd39e87b53 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Mon, 5 Sep 2016 08:02:36 +1000 Subject: [PATCH] Remove LocaleGuards from Editor class All float <=> string conversions are now done using locale independent PBD::to_string/string_to() via XMLNode::get/set_property --- gtk2_ardour/editor.cc | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index ea74b2d970..248c4713fe 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -738,22 +738,17 @@ Editor::Editor () editor_summary_pane.set_drag_cursor (*_cursors->expand_up_down); float fract; - - { - LocaleGuard lg; - - if (!settings || !settings->get_property ("edit-horizontal-pane-pos", fract) || fract > 1.0) { - /* initial allocation is 90% to canvas, 10% to notebook */ - fract = 0.90; - } - edit_pane.set_divider (0, fract); - - if (!settings || !settings->get_property ("edit-vertical-pane-pos", fract) || fract > 1.0) { - /* initial allocation is 90% to canvas, 10% to summary */ - fract = 0.90; - } - editor_summary_pane.set_divider (0, fract); + if (!settings || !settings->get_property ("edit-horizontal-pane-pos", fract) || fract > 1.0) { + /* initial allocation is 90% to canvas, 10% to notebook */ + fract = 0.90; } + edit_pane.set_divider (0, fract); + + if (!settings || !settings->get_property ("edit-vertical-pane-pos", fract) || fract > 1.0) { + /* initial allocation is 90% to canvas, 10% to summary */ + fract = 0.90; + } + editor_summary_pane.set_divider (0, fract); global_vpacker.set_spacing (2); global_vpacker.set_border_width (0); @@ -2333,7 +2328,6 @@ Editor::set_state (const XMLNode& node, int version) { set_id (node); PBD::Unwinder nsi (no_save_instant, true); - LocaleGuard lg; bool yn; Tabbable::set_state (node, version); @@ -2551,7 +2545,6 @@ XMLNode& Editor::get_state () { XMLNode* node = new XMLNode (X_("Editor")); - LocaleGuard lg; node->set_property ("id", id().to_s ());