diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-02 07:05:14 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-05 09:01:55 -0500 |
| commit | 46ed23116e44d1b4182a65511cf7ccf6b00b2a61 (patch) | |
| tree | bb745bf6f17f7f2242577824470cfba4cbe6ccde /gtk2_ardour/ui_config.h | |
| parent | 8e54baa65fa709ac8a0441e26a8bc3c624d03c25 (diff) | |
make new color aliases actually work
Diffstat (limited to 'gtk2_ardour/ui_config.h')
| -rw-r--r-- | gtk2_ardour/ui_config.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index 9021fbc60e..49cf27c93a 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -133,13 +133,8 @@ class UIConfiguration : public PBD::Stateful #include "base_colors.h" #undef CANVAS_BASE_COLOR -#undef CANVAS_COLOR -#define CANVAS_COLOR(var,name,base,modifier) ArdourCanvas::Color get_##var() const { return var.get().color(); } -#include "colors.h" -#undef CANVAS_COLOR - #undef COLOR_ALIAS -#define COLOR_ALIAS(var,name,alias) ArdourCanvas::Color get_##var() const { return color (alias); } +#define COLOR_ALIAS(var,name,alias) ArdourCanvas::Color get_##var() const { return color (name); } #include "color_aliases.h" #undef COLOR_ALIAS @@ -184,13 +179,6 @@ class UIConfiguration : public PBD::Stateful #include "base_colors.h" #undef CANVAS_BASE_COLOR - /* declare relative color variables (not directly modifiable) */ - -#undef CANVAS_COLOR -#define CANVAS_COLOR(var,name,base,modifier) RelativeHSV var; -#include "colors.h" -#undef CANVAS_COLOR - XMLNode& state (); bool _dirty; static UIConfiguration* _instance; |