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

Rename wxRibbonButtonBarButtonBase members to use m_ prefix

Browse Source 
This will avoid conflict with the function parameters with the same
names in the upcoming commits.

No real changes yet.
This commit is contained in:
Vadim Zeitlin
2020-02-07 18:09:12 +01:00
parent bd90e484cb
commit 533fd61c5e
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/ribbon/buttonbar.cpp
View File

@@ -129,10 +129,10 @@ public:
wxString label; wxString label;
wxString help_string; wxString help_string;
wxBitmap bitmap_large; wxBitmap m_bitmap_large;
wxBitmap bitmap_large_disabled; wxBitmap m_bitmap_large_disabled;
wxBitmap bitmap_small; wxBitmap m_bitmap_small;
wxBitmap bitmap_small_disabled; wxBitmap m_bitmap_small_disabled;
wxCoord text_min_width[3]; wxCoord text_min_width[3];
// Index of the bitmap in the wxRibbonBar normal image list. Notice that // Index of the bitmap in the wxRibbonBar normal image list. Notice that
@@ -367,17 +367,17 @@ wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
buttonImageList = ribbon->GetButtonImageList(m_bitmap_size_large); buttonImageList = ribbon->GetButtonImageList(m_bitmap_size_large);
buttonSmallImageList = ribbon->GetButtonSmallImageList(m_bitmap_size_small); buttonSmallImageList = ribbon->GetButtonSmallImageList(m_bitmap_size_small);
} }
if (base->bitmap_large.IsOk() && buttonImageList) if (base->m_bitmap_large.IsOk() && buttonImageList)
{ {
base->barButtonImageListPos = buttonImageList->Add(base->bitmap_large); base->barButtonImageListPos = buttonImageList->Add(base->m_bitmap_large);
base->bitmap_large = wxNullBitmap; base->m_bitmap_large = wxNullBitmap;
buttonImageList->Add(base->bitmap_large_disabled); buttonImageList->Add(base->m_bitmap_large_disabled);
base->bitmap_large_disabled = wxNullBitmap; base->m_bitmap_large_disabled = wxNullBitmap;
base->barButtonSmallImageListPos = buttonSmallImageList->Add(base->bitmap_small); base->barButtonSmallImageListPos = buttonSmallImageList->Add(base->m_bitmap_small);
base->bitmap_small = wxNullBitmap; base->m_bitmap_small = wxNullBitmap;
buttonSmallImageList->Add(base->bitmap_small_disabled); buttonSmallImageList->Add(base->m_bitmap_small_disabled);
base->bitmap_small_disabled = wxNullBitmap; base->m_bitmap_small_disabled = wxNullBitmap;
} }
wxClientDC temp_dc(this); wxClientDC temp_dc(this);
@@ -911,12 +911,12 @@ void wxRibbonButtonBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
} }
else else
{ {
wxBitmap* bitmap = &base->bitmap_large; wxBitmap* bitmap = &base->m_bitmap_large;
wxBitmap* bitmap_small = &base->bitmap_small; wxBitmap* bitmap_small = &base->m_bitmap_small;
if(base->state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED) if(base->state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED)
{ {
bitmap = &base->bitmap_large_disabled; bitmap = &base->m_bitmap_large_disabled;
bitmap_small = &base->bitmap_small_disabled; bitmap_small = &base->m_bitmap_small_disabled;
} }
m_art->DrawButtonBarButton(dc, this, rect, base->kind, m_art->DrawButtonBarButton(dc, this, rect, base->kind,
base->state | button.size, base->label, *bitmap, *bitmap_small); base->state | button.size, base->label, *bitmap, *bitmap_small);
@@ -1226,37 +1226,37 @@ void wxRibbonButtonBar::MakeBitmaps(wxRibbonButtonBarButtonBase* base,
const wxBitmap& bitmap_small, const wxBitmap& bitmap_small,
const wxBitmap& bitmap_small_disabled) const wxBitmap& bitmap_small_disabled)
{ {
base->bitmap_large = bitmap_large; base->m_bitmap_large = bitmap_large;
if(!base->bitmap_large.IsOk()) if(!base->m_bitmap_large.IsOk())
{ {
base->bitmap_large = MakeResizedBitmap(base->bitmap_small, base->m_bitmap_large = MakeResizedBitmap(base->m_bitmap_small,
m_bitmap_size_large); m_bitmap_size_large);
} }
else if(base->bitmap_large.GetScaledSize() != m_bitmap_size_large) else if(base->m_bitmap_large.GetScaledSize() != m_bitmap_size_large)
{ {
base->bitmap_large = MakeResizedBitmap(base->bitmap_large, base->m_bitmap_large = MakeResizedBitmap(base->m_bitmap_large,
m_bitmap_size_large); m_bitmap_size_large);
} }
base->bitmap_small = bitmap_small; base->m_bitmap_small = bitmap_small;
if(!base->bitmap_small.IsOk()) if(!base->m_bitmap_small.IsOk())
{ {
base->bitmap_small = MakeResizedBitmap(base->bitmap_large, base->m_bitmap_small = MakeResizedBitmap(base->m_bitmap_large,
m_bitmap_size_small); m_bitmap_size_small);
} }
else if(base->bitmap_small.GetScaledSize() != m_bitmap_size_small) else if(base->m_bitmap_small.GetScaledSize() != m_bitmap_size_small)
{ {
base->bitmap_small = MakeResizedBitmap(base->bitmap_small, base->m_bitmap_small = MakeResizedBitmap(base->m_bitmap_small,
m_bitmap_size_small); m_bitmap_size_small);
} }
base->bitmap_large_disabled = bitmap_large_disabled; base->m_bitmap_large_disabled = bitmap_large_disabled;
if(!base->bitmap_large_disabled.IsOk()) if(!base->m_bitmap_large_disabled.IsOk())
{ {
base->bitmap_large_disabled = MakeDisabledBitmap(base->bitmap_large); base->m_bitmap_large_disabled = MakeDisabledBitmap(base->m_bitmap_large);
} }
base->bitmap_small_disabled = bitmap_small_disabled; base->m_bitmap_small_disabled = bitmap_small_disabled;
if(!base->bitmap_small_disabled.IsOk()) if(!base->m_bitmap_small_disabled.IsOk())
{ {
base->bitmap_small_disabled = MakeDisabledBitmap(base->bitmap_small); base->m_bitmap_small_disabled = MakeDisabledBitmap(base->m_bitmap_small);
} }
} }