menu: make current() return an iterator

This commit is contained in:
Andrzej Rybczak
2014-11-04 22:33:16 +01:00
parent 12772c47f9
commit efdac2058e
13 changed files with 103 additions and 109 deletions

View File

@@ -110,7 +110,7 @@ std::wstring SortPlaylistDialog::title()
void SortPlaylistDialog::enterPressed()
{
w.current().value().run();
w.current()->value().run();
}
void SortPlaylistDialog::mouseButtonPressed(MEVENT me)
@@ -130,7 +130,7 @@ void SortPlaylistDialog::mouseButtonPressed(MEVENT me)
void SortPlaylistDialog::moveSortOrderDown()
{
auto cur = w.currentVI();
auto cur = w.currentV();
if ((cur+1)->item().second)
{
std::iter_swap(cur, cur+1);
@@ -140,7 +140,7 @@ void SortPlaylistDialog::moveSortOrderDown()
void SortPlaylistDialog::moveSortOrderUp()
{
auto cur = w.currentVI();
auto cur = w.currentV();
if (cur > w.beginV() && cur->item().second)
{
std::iter_swap(cur, cur-1);