13
0

save base colors (configurable colors) in normal way (code had been removed)

This commit is contained in:
Paul Davis 2014-11-19 14:00:42 -05:00
parent 318a9edab9
commit ed65c801c5

View File

@ -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;
}