From: Paul Cornett Date: Thu, 1 Dec 2011 08:16:42 +0000 (+0000) Subject: remove unused variables X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/36307fdf51fbd35a20e0c16ecf08209bdba8ff08 remove unused variables git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index ea22e1b6be..b2b88c2210 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -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) diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index d082d7ec92..ad24a03e3c 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -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) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 3e5344dddd..95a207c3a5 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -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;