From 90ce6a4334fedfe0d719678b71cf3d11bbaf3df2 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 4 Apr 2019 10:40:45 -0700
Subject: [PATCH] Remove unused variables

---
 samples/richtext/richtext.cpp   | 4 ----
 samples/typetest/typetest.cpp   | 1 -
 src/generic/datavgen.cpp        | 2 --
 src/msw/toolbar.cpp             | 6 ------
 src/osx/dataview_osx.cpp        | 5 +----
 src/osx/listbox_osx.cpp         | 4 +---
 src/propgrid/propgrid.cpp       | 8 --------
 src/ribbon/toolbar.cpp          | 3 ---
 src/richtext/richtextbuffer.cpp | 1 -
 9 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index 3dd3380ae4..63ad46d12d 100644
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -929,10 +929,6 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     wxSplitterWindow* splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE);
     sizer->Add(splitter, 1, wxEXPAND);
 
-    wxFont textFont = wxFont(wxFontInfo(12).Family(wxFONTFAMILY_ROMAN));
-    wxFont boldFont = wxFont(wxFontInfo(12).Family(wxFONTFAMILY_ROMAN));
-    wxFont italicFont = wxFont(wxFontInfo(12).Family(wxFONTFAMILY_ROMAN).Italic());
-
     m_richTextCtrl = new MyRichTextCtrl(splitter, ID_RICHTEXT_CTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxVSCROLL|wxHSCROLL/*|wxWANTS_CHARS*/);
     wxASSERT(!m_richTextCtrl->GetBuffer().GetAttributes().HasFontPixelSize());
 
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index d365ed589f..63d3a87eed 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -1012,7 +1012,6 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     textCtrl << "var1 = " << var1.MakeString() << "\n";
 
     // Conversion
-    wxString str = var1.MakeString();
 
     var1 = 123.456;
     textCtrl << "var1 = " << var1.GetReal() << "\n";
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 968bbbbb5f..178a3c886f 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -71,8 +71,6 @@ class wxDataViewCtrl;
 // constants
 //-----------------------------------------------------------------------------
 
-static const int SCROLL_UNIT_X = 15;
-
 // the cell padding on the left/right
 static const int PADDING_RIGHTLEFT = 3;
 
diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index 0a67370494..de9a1a35c8 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -1624,12 +1624,6 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {
-    // Leave the effective size as (0, 0) if we are not showing bitmaps at all.
-    wxSize effectiveSize;
-
-    if ( !HasFlag(wxTB_NOICONS) )
-        effectiveSize = size;
-
     wxToolBarBase::SetToolBitmapSize(size);
 
     ::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y));
diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index 57a1cf3970..30107475e3 100644
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -667,13 +667,10 @@ wxDataViewWidgetImpl* wxDataViewCtrl::GetDataViewPeer() const
 
 void wxDataViewCtrl::AddChildren(wxDataViewItem const& parentItem)
 {
-  int noOfChildren;
-
   wxDataViewItemArray items;
 
-
   wxCHECK_RET(GetModel() != NULL,"Model pointer not initialized.");
-  noOfChildren = GetModel()->GetChildren(parentItem,items);
+  GetModel()->GetChildren(parentItem,items);
   (void) GetModel()->ItemsAdded(parentItem,items);
 }
 
diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 90fd3338d4..adc62f2ffd 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -248,7 +248,6 @@ wxSize wxListBox::DoGetBestSize() const
 {
     int lbWidth = 100;  // some defaults
     int lbHeight;
-    int wLine;
 
     {
         wxClientDC dc(const_cast<wxListBox*>(this));
@@ -261,8 +260,7 @@ wxSize wxListBox::DoGetBestSize() const
 
             wxCoord width, height ;
             dc.GetTextExtent( str , &width, &height);
-            wLine = width ;
-            lbWidth = wxMax( lbWidth, wLine );
+            lbWidth = wxMax( lbWidth, width );
         }
 
         // Add room for the scrollbar
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 01b8759733..51a7067bef 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -2062,13 +2062,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
 #endif
 {
     const wxPGProperty* firstItem;
-    const wxPGProperty* lastItem;
-
     firstItem = DoGetItemAtY(itemsRect->y);
-    lastItem = DoGetItemAtY(itemsRect->y+itemsRect->height-1);
-
-    if ( !lastItem )
-        lastItem = GetLastItem( wxPG_ITERATE_VISIBLE );
 
     int vx, vy;
     GetViewStart(&vx, &vy);
@@ -4524,7 +4518,6 @@ bool wxPropertyGrid::DoHideProperty( wxPGProperty* p, bool hide, int flags )
         return m_pState->DoHideProperty(p, hide, flags);
 
     wxArrayPGProperty selection = m_pState->m_selection;  // Must use a copy
-    int selRemoveCount = 0;
     for ( unsigned int i=0; i<selection.size(); i++ )
     {
         wxPGProperty* selected = selection[i];
@@ -4532,7 +4525,6 @@ bool wxPropertyGrid::DoHideProperty( wxPGProperty* p, bool hide, int flags )
         {
             if ( !DoRemoveFromSelection(p, flags) )
                 return false;
-            selRemoveCount += 1;
         }
     }
 
diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp
index 64ed956ad7..ec6c2e0054 100644
--- a/src/ribbon/toolbar.cpp
+++ b/src/ribbon/toolbar.cpp
@@ -869,8 +869,6 @@ void wxRibbonToolBar::OnSize(wxSizeEvent& evt)
     if (sizingFlexibly)
         major_axis = wxHORIZONTAL;
 
-    wxSize bestSize = m_sizes[0];
-
     if(m_nrows_max != m_nrows_min)
     {
         int area = 0;
@@ -881,7 +879,6 @@ void wxRibbonToolBar::OnSize(wxSizeEvent& evt)
             {
                 area = GetSizeInOrientation(m_sizes[i], major_axis);
                 row_count = m_nrows_min + i;
-                bestSize = m_sizes[i];
             }
         }
     }
diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index eb29a00f6e..cda826f5d6 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -11523,7 +11523,6 @@ bool wxRichTextTableBlock::ComputeBlockForSelection(wxRichTextTable* table, wxRi
     {
         // Start with an invalid block and increase.
         wxRichTextTableBlock selBlock(-1, -1, -1, -1);
-        wxRichTextRangeArray ranges = selection.GetRanges();
         int row, col;
         for (row = 0; row < table->GetRowCount(); row++)
         {