From cc829b2322a9e396a18ad527c31b21d0fe95fcea Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 13 Jan 2014 07:53:17 -0800 Subject: [PATCH] Build with all icon sizes enabled on Windows. Closes #1692. --- aegisub/src/command/command.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/aegisub/src/command/command.h b/aegisub/src/command/command.h index ac6bea61c..9da61b492 100644 --- a/aegisub/src/command/command.h +++ b/aegisub/src/command/command.h @@ -34,19 +34,6 @@ namespace agi { struct Context; } #define STR_HELP(a) wxString StrHelp() const { return _(a); } #define CMD_TYPE(a) int Type() const { using namespace cmd; return a; } -#ifdef __WXMSW__ -#define CMD_ICON(icon) wxBitmap Icon(int size) const override { \ - if (size == 24) return GETIMAGE(icon##_24); \ - return GETIMAGE(icon##_16); \ -} -#elif defined(__WXMAC__) -#define CMD_ICON(icon) wxBitmap Icon(int size) const override { \ - if (size == 64) return GETIMAGE(icon##_64); \ - if (size == 32) return GETIMAGE(icon##_32); \ - if (size == 24) return GETIMAGE(icon##_24); \ - return GETIMAGE(icon##_16); \ -} -#else #define CMD_ICON(icon) wxBitmap Icon(int size) const override { \ if (size == 64) return GETIMAGE(icon##_64); \ if (size == 48) return GETIMAGE(icon##_48); \ @@ -54,7 +41,6 @@ namespace agi { struct Context; } if (size == 24) return GETIMAGE(icon##_24); \ return GETIMAGE(icon##_16); \ } -#endif #define COMMAND_GROUP(cname, cmdname, menu, disp, help) \ struct cname : public Command { \