summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-02-03 18:49:43 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-02-03 18:49:43 +0000
commit1f0f5e89bbbb1eaaad5e672d249c4d127799bb42 (patch)
treeacf39b31305eb6c31616be613ec4cf861d46148e /gtk2_ardour/editor.cc
parentc21c9e666286529fbef0539402367b8787b9964b (diff)
separate header dependencies on button joiner, and make each button joiner look up the right color for the type of buttons it contains
git-svn-id: svn://localhost/ardour2/branches/3.0@11440 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index cd3748517c..e23b439fc3 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -86,6 +86,7 @@
#include "audio_time_axis.h"
#include "automation_time_axis.h"
#include "bundle_manager.h"
+#include "button_joiner.h"
#include "canvas-noevent-text.h"
#include "canvas_impl.h"
#include "crossfade_edit.h"
@@ -2787,7 +2788,7 @@ Editor::setup_toolbar ()
/* make them just a bit bigger */
mouse_move_button.set_size_request (-1, 25);
- smart_mode_joiner = manage (new ButtonJoiner (mouse_move_button, mouse_select_button));
+ smart_mode_joiner = manage (new ButtonJoiner ("mouse mode button", mouse_move_button, mouse_select_button));
smart_mode_joiner->set_related_action (smart_mode_action);
mouse_move_button.set_rounded_corner_mask (0x1); // upper left only