From 91d8082cc90169d0a83d15bbabb8db572f9cee0b Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 3 Dec 2017 09:57:12 -0800
Subject: [PATCH] Fix ribbon page scroll button not shown on window restore

See #17453
---
 src/ribbon/page.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/ribbon/page.cpp b/src/ribbon/page.cpp
index bb9d0c0ce8..678d1d91ea 100644
--- a/src/ribbon/page.cpp
+++ b/src/ribbon/page.cpp
@@ -1002,7 +1002,6 @@ bool wxRibbonPage::ExpandPanels(wxOrientation direction, int maximum_amount)
 
 bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
 {
-    bool collapsed_something = false;
     while(minimum_amount > 0)
     {
         int largest_size = 0;
@@ -1086,7 +1085,6 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
                     largest_panel_size->y -= amount;
                 }
                 minimum_amount -= amount;
-                collapsed_something = true;
             }
             else
             {
@@ -1094,7 +1092,6 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
                 wxSize delta = (*largest_panel_size) - smaller;
                 *largest_panel_size = smaller;
                 minimum_amount -= GetSizeInOrientation(delta, direction);
-                collapsed_something = true;
             }
         }
         else
@@ -1102,7 +1099,7 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
             break;
         }
     }
-    return collapsed_something;
+    return minimum_amount <= 0;
 }
 
 bool wxRibbonPage::DismissExpandedPanel()