diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
| commit | e466ce40ad1ba591543020cb7c0aa15dbebef81e (patch) | |
| tree | f8e43560917a0a70c48d32ac171e828472cfd794 /gtk2_ardour/ardour_button.cc | |
| parent | 4fac237fdcf025c5fd5aafe207113abd6abb469b (diff) | |
| parent | a901f28c6287ff99444d6a8afe67b71531a5f7d0 (diff) | |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'gtk2_ardour/ardour_button.cc')
| -rw-r--r-- | gtk2_ardour/ardour_button.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index 89e6a20385..3f118921d6 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/gtk2_ardour/ardour_button.cc @@ -162,7 +162,7 @@ ArdourButton::set_markup (const std::string& str) _layout = Pango::Layout::create (get_pango_context()); } - _layout->set_text (str); + _layout->set_markup (str); queue_resize (); } |