Finished scaling of menu icons on Windows.

This commit is contained in:
bubnikv 2019-05-07 13:35:37 +02:00
parent 347a65bc4a
commit ab4f349456
3 changed files with 40 additions and 97 deletions

View file

@ -20,10 +20,11 @@ namespace Slic3r {
enum class ModelVolumeType : int;
};
void set_as_owner_drawn(wxMenu* menu);
const std::string& get_menuitem_icon_name(const int item_id);
void update_menu_item_icons(wxMenuItem* item);
#ifdef __WXMSW__
void msw_rescale_menu(wxMenu* menu);
#else /* __WXMSW__ */
inline void msw_rescale_menu(wxMenu* /* menu */) {}
#endif /* __WXMSW__ */
wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxString& description,
std::function<void(wxCommandEvent& event)> cb, const wxBitmap& icon, wxEvtHandler* event_handler = nullptr);
@ -955,16 +956,10 @@ class MenuWithSeparators : public wxMenu
{
public:
MenuWithSeparators(const wxString& title, long style = 0)
: wxMenu(title, style)
{
set_as_owner_drawn(this);
}
: wxMenu(title, style) {}
MenuWithSeparators(long style = 0)
: wxMenu(style)
{
set_as_owner_drawn(this);
}
: wxMenu(style) {}
~MenuWithSeparators() {}