diff --git a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs index 4bcb1b8337..132b558508 100644 --- a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs @@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk.ControlExtensions box.Items.Clear(); box.Items.AddRange( - EnumHelper.GetDescriptions<T>() + typeof(T).GetEnumDescriptions() .ToArray()); box.SelectedItem = enumVal.GetDescription(); } diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj index c7207ab1c6..3fd9768eb4 100644 --- a/BizHawk.Common/BizHawk.Common.csproj +++ b/BizHawk.Common/BizHawk.Common.csproj @@ -52,7 +52,6 @@ <Compile Include="Buffer.cs" /> <Compile Include="Colors.cs" /> <Compile Include="CustomCollections.cs" /> - <Compile Include="EnumHelper.cs" /> <Compile Include="Extensions\Extensions.cs" /> <Compile Include="Extensions\IOExtensions.cs" /> <Compile Include="Extensions\NumberExtensions.cs" /> diff --git a/BizHawk.Common/Extensions/ReflectionExtensions.cs b/BizHawk.Common/Extensions/ReflectionExtensions.cs index d455f36c03..fe79331e02 100644 --- a/BizHawk.Common/Extensions/ReflectionExtensions.cs +++ b/BizHawk.Common/Extensions/ReflectionExtensions.cs @@ -138,5 +138,19 @@ namespace BizHawk.Common.ReflectionExtensions return null; } + + /// <summary> + /// Takes an enum Type and generates a list of strings from the description attributes + /// </summary> + /// <returns></returns> + public static IEnumerable<string> GetEnumDescriptions(this Type type) + { + var vals = Enum.GetValues(type); + + foreach (var v in vals) + { + yield return v.GetDescription(); + } + } } }