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

Remove wxRibbonButtonBar::m_ownerRibbonBar

Browse Source 
There is already a function returning the containing ribbon bar, so just
use it instead.
This commit is contained in:
Vadim Zeitlin
2020-02-07 17:47:15 +01:00
parent 884c3a2dc2
commit 557843c504
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/ribbon/buttonbar.h
View File

@@ -213,7 +213,6 @@ protected:
bool m_layouts_valid; bool m_layouts_valid;
bool m_lock_active_state; bool m_lock_active_state;
bool m_show_tooltips_for_disabled; bool m_show_tooltips_for_disabled;
wxRibbonBar* m_ownerRibbonBar;
#ifndef SWIG #ifndef SWIG
wxDECLARE_CLASS(wxRibbonButtonBar); wxDECLARE_CLASS(wxRibbonButtonBar);

28
src/ribbon/buttonbar.cpp
View File

@@ -350,10 +350,10 @@ wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
wxImageList* buttonImageList = NULL; wxImageList* buttonImageList = NULL;
wxImageList* buttonSmallImageList = NULL; wxImageList* buttonSmallImageList = NULL;
if (m_ownerRibbonBar) if ( wxRibbonBar* const ribbon = GetAncestorRibbonBar() )
{ {
buttonImageList = m_ownerRibbonBar->GetButtonImageList(m_bitmap_size_large); buttonImageList = ribbon->GetButtonImageList(m_bitmap_size_large);
buttonSmallImageList = m_ownerRibbonBar->GetButtonSmallImageList(m_bitmap_size_small); buttonSmallImageList = ribbon->GetButtonSmallImageList(m_bitmap_size_small);
} }
if (base->bitmap_large.IsOk() && buttonImageList) if (base->bitmap_large.IsOk() && buttonImageList)
{ {
@@ -880,10 +880,12 @@ void wxRibbonButtonBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
wxRibbonButtonBarButtonInstance& button = layout->buttons.Item(btn_i); wxRibbonButtonBarButtonInstance& button = layout->buttons.Item(btn_i);
wxRibbonButtonBarButtonBase* base = button.base; wxRibbonButtonBarButtonBase* base = button.base;
wxRect rect(button.position + m_layout_offset, base->sizes[button.size].size); wxRect rect(button.position + m_layout_offset, base->sizes[button.size].size);
if (base->barButtonImageListPos != -1 && m_ownerRibbonBar)
wxRibbonBar* const ribbon = GetAncestorRibbonBar();
if ( base->barButtonImageListPos != -1 && ribbon )
{ {
wxImageList* buttonImageList = m_ownerRibbonBar->GetButtonImageList(m_bitmap_size_large); wxImageList* buttonImageList = ribbon->GetButtonImageList(m_bitmap_size_large);
wxImageList* buttonSmallImageList = m_ownerRibbonBar->GetButtonSmallImageList(m_bitmap_size_small); wxImageList* buttonSmallImageList = ribbon->GetButtonSmallImageList(m_bitmap_size_small);
wxBitmap bitmap; wxBitmap bitmap;
wxBitmap bitmap_small; wxBitmap bitmap_small;
@@ -939,20 +941,6 @@ void wxRibbonButtonBar::OnSize(wxSizeEvent& evt)
void wxRibbonButtonBar::CommonInit(long WXUNUSED(style)) void wxRibbonButtonBar::CommonInit(long WXUNUSED(style))
{ {
//Our ultimate parent MAY be a ribbon bar, in which case
//we can use its image list.
m_ownerRibbonBar = NULL;
wxWindow* pWin = GetParent();
while (pWin)
{
m_ownerRibbonBar = dynamic_cast<wxRibbonBar*>(pWin);
if (m_ownerRibbonBar)
{
break;
}
pWin = pWin->GetParent();
}
m_bitmap_size_large = wxSize(32, 32); m_bitmap_size_large = wxSize(32, 32);
m_bitmap_size_small = wxSize(16, 16); m_bitmap_size_small = wxSize(16, 16);