From f36401438fa915b10d82b9fcef6e0b3c2408536b Mon Sep 17 00:00:00 2001
From: Andrew Lanzone <andy@enoznal.com>
Date: Mon, 19 May 2025 23:43:28 -0700
Subject: [PATCH] Move wrap function to windowbase so all windows can use it

---
 apps/openmw/mwgui/race.cpp       | 10 ----------
 apps/openmw/mwgui/windowbase.cpp | 10 ++++++++++
 apps/openmw/mwgui/windowbase.hpp |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 6aecaa0b88..172812bf47 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -23,16 +23,6 @@
 
 namespace
 {
-    int wrap(int index, int max)
-    {
-        if (index < 0)
-            return max - 1;
-        else if (index >= max)
-            return 0;
-        else
-            return index;
-    }
-
     bool sortRaces(const std::pair<ESM::RefId, std::string>& left, const std::pair<ESM::RefId, std::string>& right)
     {
         return left.second.compare(right.second) < 0;
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index ae12076d2d..995731a775 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -15,6 +15,16 @@
 
 using namespace MWGui;
 
+int MWGui::wrap(int index, int max)
+{
+    if (index < 0)
+        return max - 1;
+    else if (index >= max)
+        return 0;
+    else
+        return index;
+}
+
 WindowBase::WindowBase(std::string_view parLayout)
     : Layout(parLayout)
 {
diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp
index f14c41dca1..2b1afbda85 100644
--- a/apps/openmw/mwgui/windowbase.hpp
+++ b/apps/openmw/mwgui/windowbase.hpp
@@ -14,6 +14,8 @@ namespace MWGui
 {
     class DragAndDrop;
 
+    int wrap(int index, int max);
+
     struct ControllerButtonStr
     {
         std::string a;