From 57d1d92a9ec0df836996116ea4fed9e512489f12 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sat, 19 May 2012 15:49:12 +0000
Subject: [PATCH] Make the 32x32 icons available in the program

Originally committed to SVN as r6833.
---
 aegisub/src/command/command.cpp |  8 +-------
 aegisub/src/command/icon.cpp    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/aegisub/src/command/command.cpp b/aegisub/src/command/command.cpp
index d7247a4a7..c69c67230 100644
--- a/aegisub/src/command/command.cpp
+++ b/aegisub/src/command/command.cpp
@@ -64,13 +64,7 @@ namespace cmd {
 	}
 
 	wxBitmap const& Command::Icon(int size) {
-		if (size == 16) {
-			return icon::get(name(), 16);
-		} else if (size == 24) {
-			return icon::get(name(), 24);
-		} else {
-			throw CommandIconInvalid("Valid icon sizes are 16 or 24.");
-		}
+		return icon::get(name(), size);
 	}
 
 	std::vector<std::string> get_registered_commands() {
diff --git a/aegisub/src/command/icon.cpp b/aegisub/src/command/icon.cpp
index bf6aa71a0..86a3ad5c7 100644
--- a/aegisub/src/command/icon.cpp
+++ b/aegisub/src/command/icon.cpp
@@ -37,17 +37,22 @@ typedef std::map<std::string, wxBitmap> iconMap;
 
 iconMap icon16;
 iconMap icon24;
+iconMap icon32;
 
 wxBitmap const& get(std::string const& name, const int size) {
 	// XXX: This code will go away with dynamic icon generation so I'm not
 	//      concerned about it.
 	iconMap::iterator index;
-	if (size != 24) {
-		if ((index = icon16.find(name)) != icon16.end())
+	if (size == 32) {
+		if ((index = icon32.find(name)) != icon32.end())
+			return index->second;
+	}
+	else if (size == 24) {
+		if ((index = icon24.find(name)) != icon24.end())
 			return index->second;
 	}
 	else {
-		if ((index = icon24.find(name)) != icon24.end())
+		if ((index = icon16.find(name)) != icon16.end())
 			return index->second;
 	}
 
@@ -67,7 +72,8 @@ wxBitmap getimage(const unsigned char *buff, size_t size) {
 
 #define INSERT_ICON(a, b) \
 	icon16.insert(std::make_pair(a, getimage(b##_16, sizeof(b##_16)))); \
-	icon24.insert(std::make_pair(a, getimage(b##_24, sizeof(b##_24))));
+	icon24.insert(std::make_pair(a, getimage(b##_24, sizeof(b##_24)))); \
+	icon32.insert(std::make_pair(a, getimage(b##_32, sizeof(b##_32))));
 
 
 void icon_init() {