diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-02 14:50:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-02 14:50:09 +0000 |
| commit | 1cb5aed0ce24605d16684e3d49167c81b8c83587 (patch) | |
| tree | 3f8df0afa90449402729fc51a86d8c370151a92a | |
| parent | 2010c0489fb1e482d54c008f6c58fc64e6c406cf (diff) | |
couple of fixes to enable building, and building with gtkmm 2.2(<4)
git-svn-id: svn://localhost/ardour2/branches/3.0@12540 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/patch_change_dialog.cc | 4 | ||||
| -rw-r--r-- | libs/midi++2/midi++/midnam_patch.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index a9ad5c7839..354cbfbf6a 100644 --- a/gtk2_ardour/patch_change_dialog.cc +++ b/gtk2_ardour/patch_change_dialog.cc @@ -151,7 +151,7 @@ PatchChangeDialog::fill_bank_combo () for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = banks->begin(); i != banks->end(); ++i) { string n = (*i)->name (); boost::replace_all (n, "_", " "); - _bank_combo.append (n); + _bank_combo.append_text (n); } } @@ -235,7 +235,7 @@ PatchChangeDialog::fill_patch_combo () for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) { string n = (*j)->name (); boost::replace_all (n, "_", " "); - _patch_combo.append (n); + _patch_combo.append_text (n); } } diff --git a/libs/midi++2/midi++/midnam_patch.h b/libs/midi++2/midi++/midnam_patch.h index 505245ae84..01b8837f2d 100644 --- a/libs/midi++2/midi++/midnam_patch.h +++ b/libs/midi++2/midi++/midnam_patch.h @@ -21,6 +21,7 @@ #ifndef MIDNAM_PATCH_H_ #define MIDNAM_PATCH_H_ +#include <iostream> #include <string> #include <list> #include <set> @@ -139,8 +140,6 @@ private: std::string _patch_list_name; }; -#include <iostream> - class ChannelNameSet { public: |