From d5ed49db10c48031e98e92c0a577964b0581c794 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 15 Nov 2023 14:33:49 +0300
Subject: CCtrlListView::addItem() doesn't add strings in the reverse order
 anymore

---
 include/m_gui.h                            | 1 +
 plugins/MirLua/src/options.cpp             | 2 +-
 plugins/SeenPlugin/src/options.cpp         | 2 +-
 protocols/ICQ-WIM/src/groups.cpp           | 2 +-
 src/mir_core/src/Windows/CCtrlListView.cpp | 9 +++++----
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/m_gui.h b/include/m_gui.h
index ff6c40d43d..4386af0c79 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -1003,6 +1003,7 @@ public:
 class MIR_CORE_EXPORT CCtrlListView : public CCtrlBase
 {
 	typedef CCtrlBase CSuper;
+	int m_iItem = 0;
 
 public:
 	CCtrlListView(CDlgBase *dlg, int ctrlId);
diff --git a/plugins/MirLua/src/options.cpp b/plugins/MirLua/src/options.cpp
index 95bb8d44c0..0da9f34357 100644
--- a/plugins/MirLua/src/options.cpp
+++ b/plugins/MirLua/src/options.cpp
@@ -30,7 +30,7 @@ static int ScriptStatusToIcon(ScriptStatus status)
 
 void CMLuaOptionsMain::LoadScripts()
 {
-	for (auto &script : g_plugin.m_scripts.rev_iter()) {
+	for (auto &script : g_plugin.m_scripts) {
 		int iIcon = ScriptStatusToIcon(script->GetStatus());
 		int iItem = m_scriptsList.AddItem(script->GetName(), iIcon, (LPARAM)script);
 		m_scriptsList.SetCheckState(iItem, script->IsEnabled());
diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp
index af07e1fee6..765fedb421 100644
--- a/plugins/SeenPlugin/src/options.cpp
+++ b/plugins/SeenPlugin/src/options.cpp
@@ -264,7 +264,7 @@ public:
 		lvc.cx = 120;
 		protocols.InsertColumn(0, &lvc);
 
-		for (auto &pa : Accounts().rev_iter()) {
+		for (auto &pa : Accounts()) {
 			if (CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)
 				continue;
 
diff --git a/protocols/ICQ-WIM/src/groups.cpp b/protocols/ICQ-WIM/src/groups.cpp
index 29e1a97673..58bbe61311 100644
--- a/protocols/ICQ-WIM/src/groups.cpp
+++ b/protocols/ICQ-WIM/src/groups.cpp
@@ -57,7 +57,7 @@ public:
 	{
 		groups.DeleteAllItems();
 
-		for (auto &it : m_proto->m_arGroups.rev_iter())
+		for (auto &it : m_proto->m_arGroups)
 			groups.AddItem(it->wszName, 0, (LPARAM)it);
 	}
 
diff --git a/src/mir_core/src/Windows/CCtrlListView.cpp b/src/mir_core/src/Windows/CCtrlListView.cpp
index 40bb1f481e..dd34ae1921 100644
--- a/src/mir_core/src/Windows/CCtrlListView.cpp
+++ b/src/mir_core/src/Windows/CCtrlListView.cpp
@@ -132,7 +132,7 @@ void CCtrlListView::AddColumn(int iSubItem, const wchar_t *name, int cx)
 
 void CCtrlListView::AddGroup(int iGroupId, const wchar_t *name)
 {
-	LVGROUP lvg = { 0 };
+	LVGROUP lvg = {};
 	lvg.cbSize = sizeof(lvg);
 	lvg.mask = LVGF_HEADER | LVGF_GROUPID;
 	lvg.pszHeader = (LPWSTR)name;
@@ -143,8 +143,9 @@ void CCtrlListView::AddGroup(int iGroupId, const wchar_t *name)
 
 int CCtrlListView::AddItem(const wchar_t *text, int iIcon, LPARAM lParam, int iGroupId)
 {
-	LVITEM lvi = { 0 };
+	LVITEM lvi = {};
 	lvi.mask = LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE;
+	lvi.iItem = m_iItem++;
 	lvi.iSubItem = 0;
 	lvi.pszText = (LPWSTR)text;
 	lvi.iImage = iIcon;
@@ -159,7 +160,7 @@ int CCtrlListView::AddItem(const wchar_t *text, int iIcon, LPARAM lParam, int iG
 
 void CCtrlListView::SetItem(int iItem, int iSubItem, const wchar_t *text, int iIcon)
 {
-	LVITEM lvi = { 0 };
+	LVITEM lvi = {};
 	lvi.mask = LVIF_TEXT;
 	lvi.iItem = iItem;
 	lvi.iSubItem = iSubItem;
@@ -174,7 +175,7 @@ void CCtrlListView::SetItem(int iItem, int iSubItem, const wchar_t *text, int iI
 
 LPARAM CCtrlListView::GetItemData(int iItem) const
 {
-	LVITEM lvi = { 0 };
+	LVITEM lvi = {};
 	lvi.mask = LVIF_PARAM;
 	lvi.iItem = iItem;
 	return GetItem(&lvi) ? lvi.lParam : -1;
-- 
cgit v1.2.3