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

Rename local variable in wxAUI to not have "m_" prefix

Browse Source 
This was just confusing, as only member variables are supposed to use
this prefix.

No real changes.
This commit is contained in:
Vadim Zeitlin
2020-03-10 23:18:48 +01:00
parent ec36eb990b
commit 931f4b8d20
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/aui/auibar.cpp
View File

@@ -1938,14 +1938,14 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
for (i = 0, count = m_items.GetCount(); i < count; ++i) for (i = 0, count = m_items.GetCount(); i < count; ++i)
{ {
wxAuiToolBarItem& item = m_items.Item(i); wxAuiToolBarItem& item = m_items.Item(i);
wxSizerItem* m_sizerItem = NULL; wxSizerItem* sizerItem = NULL;
switch (item.m_kind) switch (item.m_kind)
{ {
case wxITEM_LABEL: case wxITEM_LABEL:
{ {
wxSize size = m_art->GetLabelSize(dc, this, item); wxSize size = m_art->GetLabelSize(dc, this, item);
m_sizerItem = sizer->Add(size.x + (m_toolBorderPadding*2), sizerItem = sizer->Add(size.x + (m_toolBorderPadding*2),
size.y + (m_toolBorderPadding*2), size.y + (m_toolBorderPadding*2),
item.m_proportion, item.m_proportion,
item.m_alignment); item.m_alignment);
@@ -1962,7 +1962,7 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
case wxITEM_RADIO: case wxITEM_RADIO:
{ {
wxSize size = m_art->GetToolSize(dc, this, item); wxSize size = m_art->GetToolSize(dc, this, item);
m_sizerItem = sizer->Add(size.x + (m_toolBorderPadding*2), sizerItem = sizer->Add(size.x + (m_toolBorderPadding*2),
size.y + (m_toolBorderPadding*2), size.y + (m_toolBorderPadding*2),
0, 0,
item.m_alignment); item.m_alignment);
@@ -1978,9 +1978,9 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
case wxITEM_SEPARATOR: case wxITEM_SEPARATOR:
{ {
if (horizontal) if (horizontal)
m_sizerItem = sizer->Add(separatorSize, 1, 0, wxEXPAND); sizerItem = sizer->Add(separatorSize, 1, 0, wxEXPAND);
else else
m_sizerItem = sizer->Add(1, separatorSize, 0, wxEXPAND); sizerItem = sizer->Add(1, separatorSize, 0, wxEXPAND);
// add tool packing // add tool packing
if (i+1 < count) if (i+1 < count)
@@ -1993,14 +1993,13 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
case wxITEM_SPACER: case wxITEM_SPACER:
if (item.m_proportion > 0) if (item.m_proportion > 0)
m_sizerItem = sizer->AddStretchSpacer(item.m_proportion); sizerItem = sizer->AddStretchSpacer(item.m_proportion);
else else
m_sizerItem = sizer->Add(item.m_spacerPixels, 1); sizerItem = sizer->Add(item.m_spacerPixels, 1);
break; break;
case wxITEM_CONTROL: case wxITEM_CONTROL:
{ {
//m_sizerItem = sizer->Add(item.m_window, item.m_proportion, wxEXPAND);
wxSizerItem* ctrl_m_sizerItem; wxSizerItem* ctrl_m_sizerItem;
wxBoxSizer* vert_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* vert_sizer = new wxBoxSizer(wxVERTICAL);
@@ -2016,7 +2015,7 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
} }
m_sizerItem = sizer->Add(vert_sizer, item.m_proportion, wxEXPAND); sizerItem = sizer->Add(vert_sizer, item.m_proportion, wxEXPAND);
wxSize min_size = item.m_minSize; wxSize min_size = item.m_minSize;
@@ -2030,7 +2029,7 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
if (min_size.IsFullySpecified()) if (min_size.IsFullySpecified())
{ {
m_sizerItem->SetMinSize(min_size); sizerItem->SetMinSize(min_size);
ctrl_m_sizerItem->SetMinSize(min_size); ctrl_m_sizerItem->SetMinSize(min_size);
} }
@@ -2042,7 +2041,7 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
} }
} }
item.m_sizerItem = m_sizerItem; item.m_sizerItem = sizerItem;
} }
// add "right" padding // add "right" padding