Added preset grouping to all presets ComboBoxes

Changed icons for action_undo, sys_lock and sys_unlock.
There are used same icons for all OS now.

Deleted/Commented temporarily used wxDataViewTreeCtrl
This commit is contained in:
YuSanka 2018-04-11 13:56:37 +02:00
parent e7520c3d18
commit 762306d985
7 changed files with 87 additions and 27 deletions

View file

@ -31,7 +31,10 @@ public:
static wxBitmap mksolid(size_t width, size_t height, unsigned char r, unsigned char g, unsigned char b, unsigned char transparency);
static wxBitmap mksolid(size_t width, size_t height, const unsigned char rgb[3]) { return mksolid(width, height, rgb[0], rgb[1], rgb[2], wxALPHA_OPAQUE); }
static wxBitmap mkclear(size_t width, size_t height) { return mksolid(width, height, 0, 0, 0, wxALPHA_TRANSPARENT); }
static wxBitmap mkclear(size_t width, size_t height) {
wxColour bg_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
return mksolid(width, height, bg_clr.Red(), bg_clr.Green(), bg_clr.Blue()/*, 0, 0, 0*/, wxALPHA_TRANSPARENT);
}
private:
std::map<std::string, wxBitmap*> m_map;