summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2016-09-05 08:02:36 +1000
committerTim Mayberry <mojofunk@gmail.com>2017-06-22 10:48:38 +1000
commit2b0adc8f751e3639407908300a14d6dd39e87b53 (patch)
tree2308093fb008bb6ce56f035e3eb79d7322b6d685
parent1170bd9043dc7cd9bdd534c7b75b2f2175e3e3c8 (diff)
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
-rw-r--r--gtk2_ardour/editor.cc25
1 files changed, 9 insertions, 16 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;
+ 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);
- {
- 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-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<bool> 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 ());