projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd49a24
)
part two of remove CANVAS_STRING_VARIABLE (it was replaced by CANVAS_FONT_VARIABLE
author
Paul Davis
<paul@linuxaudiosystems.com>
Fri, 5 Dec 2014 14:26:12 +0000
(09:26 -0500)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Fri, 5 Dec 2014 14:26:12 +0000
(09:26 -0500)
gtk2_ardour/ui_config.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/ui_config.cc
b/gtk2_ardour/ui_config.cc
index 1d3b4c82b57a14e1da253971bf8527f580aed1c8..ddad50c5282861e8eb6109268064c4d0a6ce79ed 100644
(file)
--- 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),
:
#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
#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
#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
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); }
#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
#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;
#undef CANVAS_FONT_VARIABLE
return *node;
@@
-367,10
+362,6
@@
UIConfiguration::set_variables (const XMLNode& node)
if (var.set_from_node (node)) { \
ParameterChanged (name); \
}
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); \
#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
#include "ui_config_vars.h"
#include "canvas_vars.h"
#undef UI_CONFIG_VARIABLE
-#undef CANVAS_STRING_VARIABLE
#undef CANVAS_FONT_VARIABLE
/* Reset base colors */
#undef CANVAS_FONT_VARIABLE
/* Reset base colors */