1 files changed, 15 insertions, 16 deletions
diff --git a/src/binres/binres.cpp b/src/binres/binres.cpp
index cc752c4..362547b 100644
--- a/src/binres/binres.cpp
+++ b/src/binres/binres.cpp
@@ -1,4 +1,5 @@
 #include "binres.hpp"
+#include <unordered_map>
 
 // Embedded binary data (e.g: PGNs icons):
 #include "binary_data.hpp"
@@ -10,23 +11,21 @@ wxBitmap LoadPNG(std::string icon, wxSize size) {
 }
 
 wxBitmap LoadPNG(std::string icon) {
-  if (icon == "swap") {
-    return (wxBITMAP_PNG_FROM_DATA(swap));
-  } else if (icon == "zoomin") {
-    return (wxBITMAP_PNG_FROM_DATA(zoomin));
-  } else if (icon == "zoomout") {
-    return (wxBITMAP_PNG_FROM_DATA(zoomout));
-  } else if (icon == "cburnett") {
-    return (wxBITMAP_PNG_FROM_DATA(cburnett));
-  } else if (icon == "chesscom_8bits") {
-    return (wxBITMAP_PNG_FROM_DATA(chesscom_8bits));
-  } else if (icon == "hide") {
-    return (wxBITMAP_PNG_FROM_DATA(hide));
-  } else if (icon == "mat") {
-    return (wxBITMAP_PNG_FROM_DATA(mat));
-  } else if (icon == "ochess") {
-    return (wxBITMAP_PNG_FROM_DATA(ochess));
+  std::unordered_map<std::string, wxBitmap> u = {
+    {"ui_zoom_in", wxBITMAP_PNG_FROM_DATA(ui_zoom_in)},
+    {"ui_zoom_out", wxBITMAP_PNG_FROM_DATA(ui_zoom_out)},
+    {"ui_coins_swap", wxBITMAP_PNG_FROM_DATA(ui_coins_swap)},
+    {"ui_eye_close", wxBITMAP_PNG_FROM_DATA(ui_eye_close)},
+    {"mat", wxBITMAP_PNG_FROM_DATA(mat)},
+    {"ochess", wxBITMAP_PNG_FROM_DATA(ochess)},
+    {"cburnett", wxBITMAP_PNG_FROM_DATA(cburnett)},
+    {"chesscom_8bits", wxBITMAP_PNG_FROM_DATA(chesscom_8bits)}
+  };
+  // Return png if exists
+  if(u.count(icon)){
+    return u[icon];
   }
+  // Otherwise null bitmap
   return (wxNullBitmap);
 }