Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxImageList in wxRibbonBar unconditionally

Browse Source 
There shouldn't be any reason not to do it other than possible bugs in
wxImageList itself, that should be fixed there.
This commit is contained in:
Vadim Zeitlin
2020-02-07 17:44:08 +01:00
parent 714fefb3e5
commit 884c3a2dc2
4 changed files with 17 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/ribbon/bar.h
View File

@@ -154,12 +154,9 @@ public:
void HideIfExpanded();
void UseImageList(bool useImageList = true) { m_useImageList = useImageList; }
bool UsesImageList() const { return m_useImageList; }
// Implementation only.
wxImageList* GetButtonImageList(wxSize* isize = NULL);
// Implementation only.
wxImageList* GetButtonSmallImageList(wxSize* isize = NULL);
wxImageList* GetButtonImageList(wxSize size);
wxImageList* GetButtonSmallImageList(wxSize size);
protected:
friend class wxRibbonPage;
@@ -217,7 +214,6 @@ protected:
wxRibbonDisplayMode m_ribbon_state;
bool m_useImageList;
wxImageList* m_buttonImageList;
wxImageList* m_buttonSmallImageList;