summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-12-05 09:26:12 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2014-12-05 09:26:12 -0500
commit0045891362481a56b12d64847f8ffa56e6968b93 (patch)
treee8ac39a02612bae8c613557a612bda1cb213d994 /gtk2_ardour
parentdd49a249ad945b78a72178b8653b349fa3db51f6 (diff)
part two of remove CANVAS_STRING_VARIABLE (it was replaced by CANVAS_FONT_VARIABLE
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ui_config.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 1d3b4c82b5..ddad50c528 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -54,12 +54,10 @@ UIConfiguration::UIConfiguration ()
:
#undef UI_CONFIG_VARIABLE
#define UI_CONFIG_VARIABLE(Type,var,name,val) var (name,val),
-#define CANVAS_STRING_VARIABLE(var,name) var (name),
#define CANVAS_FONT_VARIABLE(var,name) var (name),
#include "ui_config_vars.h"
#include "canvas_vars.h"
#undef UI_CONFIG_VARIABLE
-#undef CANVAS_STRING_VARIABLE
#undef CANVAS_FONT_VARIABLE
/* initialize all the base colors using default
@@ -318,15 +316,12 @@ UIConfiguration::get_variables (std::string which_node)
node = new XMLNode (which_node);
#undef UI_CONFIG_VARIABLE
-#undef CANVAS_STRING_VARIABLE
#undef CANVAS_FONT_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
return *node;
@@ -367,10 +362,6 @@ UIConfiguration::set_variables (const XMLNode& node)
if (var.set_from_node (node)) { \
ParameterChanged (name); \
}
-#define CANVAS_STRING_VARIABLE(var,name) \
- if (var.set_from_node (node)) { \
- ParameterChanged (name); \
- }
#define CANVAS_FONT_VARIABLE(var,name) \
if (var.set_from_node (node)) { \
ParameterChanged (name); \
@@ -378,7 +369,6 @@ UIConfiguration::set_variables (const XMLNode& node)
#include "ui_config_vars.h"
#include "canvas_vars.h"
#undef UI_CONFIG_VARIABLE
-#undef CANVAS_STRING_VARIABLE
#undef CANVAS_FONT_VARIABLE
/* Reset base colors */