remove unused variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
612633432a
commit
36307fdf51
@ -655,14 +655,13 @@ void wxAuiDefaultToolBarArt::DrawGripper(wxDC& dc,
|
||||
}
|
||||
|
||||
void wxAuiDefaultToolBarArt::DrawOverflowButton(wxDC& dc,
|
||||
wxWindow* wnd,
|
||||
wxWindow* /*wnd*/,
|
||||
const wxRect& rect,
|
||||
int state)
|
||||
{
|
||||
if (state & wxAUI_BUTTON_STATE_HOVER ||
|
||||
state & wxAUI_BUTTON_STATE_PRESSED)
|
||||
{
|
||||
wxRect cli_rect = wnd->GetClientRect();
|
||||
wxColor light_gray_bg = m_highlightColour.ChangeLightness(170);
|
||||
|
||||
if (m_flags & wxAUI_TB_VERTICAL)
|
||||
|
@ -1935,7 +1935,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
|
||||
}
|
||||
|
||||
// Is the tab visible?
|
||||
bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd)
|
||||
bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* /*wnd*/)
|
||||
{
|
||||
if (!dc || !dc->IsOk())
|
||||
return false;
|
||||
@ -2021,9 +2021,6 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin
|
||||
// See if the given page is visible at the given tab offset (effectively scroll position)
|
||||
for (i = tabOffset; i < page_count; ++i)
|
||||
{
|
||||
wxAuiNotebookPage& page = m_pages.Item(i);
|
||||
wxAuiTabContainerButton& tab_button = m_tabCloseButtons.Item(i);
|
||||
|
||||
rect.x = offset;
|
||||
rect.width = m_rect.width - right_buttons_width - offset - 2;
|
||||
|
||||
@ -2031,14 +2028,6 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin
|
||||
return false; // haven't found the tab, and we've run out of space, so return false
|
||||
|
||||
int x_extent = 0;
|
||||
wxSize size = m_art->GetTabSize(*dc,
|
||||
wnd,
|
||||
page.caption,
|
||||
page.bitmap,
|
||||
page.active,
|
||||
tab_button.curState,
|
||||
&x_extent);
|
||||
|
||||
offset += x_extent;
|
||||
|
||||
if (i == (size_t) tabPage)
|
||||
|
@ -8152,15 +8152,11 @@ bool wxRichTextTable::Layout(wxDC& dc, const wxRect& rect, int style)
|
||||
}
|
||||
|
||||
// Get internal padding
|
||||
int paddingLeft = 0, paddingRight = 0, paddingTop = 0, paddingBottom = 0;
|
||||
int paddingLeft = 0, paddingTop = 0;
|
||||
if (GetAttributes().GetTextBoxAttr().GetPadding().GetLeft().IsValid())
|
||||
paddingLeft = converter.GetPixels(GetAttributes().GetTextBoxAttr().GetPadding().GetLeft());
|
||||
if (GetAttributes().GetTextBoxAttr().GetPadding().GetRight().IsValid())
|
||||
paddingRight = converter.GetPixels(GetAttributes().GetTextBoxAttr().GetPadding().GetRight());
|
||||
if (GetAttributes().GetTextBoxAttr().GetPadding().GetTop().IsValid())
|
||||
paddingTop = converter.GetPixels(GetAttributes().GetTextBoxAttr().GetPadding().GetTop());
|
||||
if (GetAttributes().GetTextBoxAttr().GetPadding().GetLeft().IsValid())
|
||||
paddingBottom = converter.GetPixels(GetAttributes().GetTextBoxAttr().GetPadding().GetBottom());
|
||||
|
||||
// Assume that left and top padding are also used for inter-cell padding.
|
||||
int paddingX = paddingLeft;
|
||||
|
Loading…
Reference in New Issue
Block a user