mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Remove some pointess stuff in the icon code

Browse source 
Originally committed to SVN as r6914.
This commit is contained in:
Thomas Goyne 2012-06-23 01:06:35 +00:00
parent bfa3aba654
commit e99b1aaad4
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
aegisub/src/command/icon.cpp
View file

@ -18,19 +18,17 @@
/// @brief Icon for commands. /// @brief Icon for commands.
/// @ingroup command /// @ingroup command
#include "../config.h"
#include "icon.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#include <map> #include <map>
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/mstream.h>
#endif #endif
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include "icon.h" #include "../libresrc/libresrc.h"
#include "../libresrc/bitmap.h"
namespace icon { namespace icon {
typedef std::map<std::string, wxBitmap> iconMap; typedef std::map<std::string, wxBitmap> iconMap;
@ -62,25 +60,15 @@ wxBitmap const& get(std::string const& name, const int size) {
return bad; return bad;
} }
wxBitmap getimage(const unsigned char *buff, size_t size) {
wxMemoryInputStream mem(buff, size);
wxImage img(mem);
return wxBitmap(img);
}
#define INSERT_ICON(a, b) \ #define INSERT_ICON(a, b) \
icon16.insert(std::make_pair(a, getimage(b##_16, sizeof(b##_16)))); \ icon16.insert(std::make_pair(a, GETIMAGE(b##_16))); \
icon24.insert(std::make_pair(a, getimage(b##_24, sizeof(b##_24)))); \ icon24.insert(std::make_pair(a, GETIMAGE(b##_24))); \
icon32.insert(std::make_pair(a, getimage(b##_32, sizeof(b##_32)))); icon32.insert(std::make_pair(a, GETIMAGE(b##_32)));
void icon_init() { void icon_init() {
// Seems that WX doesn't install the handlers early enough for our use. // Seems that WX doesn't install the handlers early enough for our use.
wxPNGHandler *handler = new wxPNGHandler(); wxPNGHandler *handler = new wxPNGHandler();
wxImage::AddHandler(handler); wxImage::AddHandler(handler);
wxString handler_name(handler->GetName());
LOG_D("icon/init") << "Generating 24x24, 16x16 icons"; LOG_D("icon/init") << "Generating 24x24, 16x16 icons";
@ -187,6 +175,6 @@ INSERT_ICON("video/zoom/out", zoom_out_button)
// Remove the handler to avoid "Duplicate handler" warnings from WX since // Remove the handler to avoid "Duplicate handler" warnings from WX since
// it will attempt to install all the handlers later on. // it will attempt to install all the handlers later on.
wxImage::RemoveHandler(handler_name); wxImage::RemoveHandler(handler->GetName());
} }
} // namespace icon } // namespace icon