diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp index bf7e7070a2..92df5cb2b1 100644 --- a/samples/widgets/bmpcombobox.cpp +++ b/samples/widgets/bmpcombobox.cpp @@ -554,10 +554,6 @@ void BitmapComboBoxWidgetsPage::OnButtonInsert(wxCommandEvent& WXUNUSED(event)) m_textInsert->SetValue(wxString::Format("test item %u", ++s_item)); } - int sel = m_combobox->GetSelection(); - if ( sel == wxNOT_FOUND ) - sel = m_combobox->GetCount(); - m_combobox->Insert(s, wxNullBitmap, m_combobox->GetSelection()); } diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index f31bb456a9..1e7a55062f 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -162,10 +162,7 @@ void wxAuiGenericToolBarArt::UpdateColoursFromSystem() { m_baseColour = GetBaseColor(); m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); - wxColor darker1Colour = m_baseColour.ChangeLightness(85); - wxColor darker2Colour = m_baseColour.ChangeLightness(75); wxColor darker3Colour = m_baseColour.ChangeLightness(60); - wxColor darker4Colour = m_baseColour.ChangeLightness(50); wxColor darker5Colour = m_baseColour.ChangeLightness(40); int pen_width = wxWindow::FromDIP(1, NULL); diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index 0ad649e50f..268991d650 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -791,11 +791,7 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin if (offset == 0) offset += m_art->GetIndentSize(); - wxRect active_rect; - wxRect rect = m_rect; - rect.y = 0; - rect.height = m_rect.height; // See if the given page is visible at the given tab offset (effectively scroll position) for (i = tabOffset; i < page_count; ++i) @@ -803,7 +799,6 @@ bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWin 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 - wnd->FromDIP(2); if (rect.width <= 0) diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp index 7168307302..c5d04e1efd 100644 --- a/src/aui/dockart.cpp +++ b/src/aui/dockart.cpp @@ -751,10 +751,7 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxRect rect = _rect; - int old_y = rect.y; rect.y = rect.y + (rect.height/2) - (bmp.GetScaledHeight()/2); - rect.height = old_y + rect.height - rect.y - 1; - if (button_state == wxAUI_BUTTON_STATE_PRESSED) { diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 6c20bea464..db245edd4b 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -1726,17 +1726,14 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, if (action_pane == -1) return; - offset = 0; for (pane_i = action_pane-1; pane_i >= 0; --pane_i) { int amount = positions[pane_i+1] - (positions[pane_i] + sizes[pane_i]); if (amount >= 0) - offset += amount; + ; else positions[pane_i] -= -amount; - - offset += sizes[pane_i]; } // if the dock mode is fixed, make sure none of the panes diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index a14bd674ef..cd72d411d7 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -1073,7 +1073,6 @@ bool wxZipEntry::LoadExtraInfo(const char* extraData, wxUint16 extraLen, bool lo // promoted to int, which has range large enough to deal with any value // of the field length. extraData += fieldLen + 4; - extraLen -= fieldLen + 4; } // extraInfo had unknown format diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index 270717a63b..9de2d1c401 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -211,7 +211,6 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, // dragged. wxSize clientSize; - wxPoint pt; if (!m_fullScreen) { clientSize = window->GetClientSize(); @@ -225,7 +224,6 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, clientSize.x = w; clientSize.y = h; if (rect) { - pt.x = m_boundingRect.x; pt.y = m_boundingRect.y; clientSize.x = m_boundingRect.width; clientSize.y = m_boundingRect.height; } else