From ed65c801c5adfc053ed99a639f2e08d9f8406178 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 19 Nov 2014 14:00:42 -0500 Subject: [PATCH] save base colors (configurable colors) in normal way (code had been removed) --- gtk2_ardour/ui_config.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 28d7fcc392..e7dc1428ae 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -756,17 +756,23 @@ UIConfiguration::get_variables (std::string which_node) XMLNode* node; LocaleGuard lg (X_("POSIX")); - node = new XMLNode(which_node); + node = new XMLNode (which_node); -#undef UI_CONFIG_VARIABLE -#define UI_CONFIG_VARIABLE(Type,var,Name,value) if (node->name() == "UI") { var.add_to_node (*node); } -#define CANVAS_STRING_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); } -#define CANVAS_FONT_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); } -#include "ui_config_vars.h" -#include "canvas_vars.h" #undef UI_CONFIG_VARIABLE #undef CANVAS_STRING_VARIABLE #undef CANVAS_FONT_VARIABLE +#undef CANVAS_BASE_COLOR +#define UI_CONFIG_VARIABLE(Type,var,Name,value) if (node->name() == "UI") { var.add_to_node (*node); } +#define CANVAS_STRING_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); } +#define CANVAS_FONT_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); } +#define CANVAS_BASE_COLOR(var,Name,val) if (node->name() == "Canvas") { var.add_to_node (*node); } +#include "ui_config_vars.h" +#include "canvas_vars.h" +#include "base_colors.h" +#undef UI_CONFIG_VARIABLE +#undef CANVAS_STRING_VARIABLE +#undef CANVAS_FONT_VARIABLE +#undef CANVAS_BASE_COLOR return *node; }