From eed2fb4fe4adde63579112e571d114aa8356f41d Mon Sep 17 00:00:00 2001
From: Chris Mayo <unknown>
Date: Wed, 10 Aug 2016 10:59:37 +1000
Subject: Bug [#1851]. Fix scroll bar size warnings.

---
 doc/ScintillaHistory.html | 13 +++++++++++++
 gtk/ScintillaGTK.cxx      |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 82c992800..d96ab3283 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -490,6 +490,7 @@
 	<td>Pavel Sountsov</td>
 	<td>Dirk Lorenzen</td>
 	<td>Kasper B. Graversen</td>
+	<td>Chris Mayo</td>
     </tr>
     </table>
     <p>
@@ -501,6 +502,18 @@
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
+    <h3>
+       <a href="http://www.scintilla.org/scite367.zip">Release 3.6.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 24 May 2016.
+	</li>
+	<li>
+	Fix scroll bar size warnings on GTK+ caused by #1831.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1851/">Bug #1851</a>.
+	</li>
+    </ul>
     <h3>
        <a href="http://www.scintilla.org/scite366.zip">Release 3.6.6</a>
     </h3>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index ab6432deb..08d2714e7 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -1747,7 +1747,7 @@ void ScintillaGTK::Resize(int width, int height) {
 	minVScrollBarHeight = minimum.height;
 	verticalScrollBarWidth = requisition.width;
 	gtk_widget_get_preferred_size(PWidget(scrollbarh), &minimum, &requisition);
-	minHScrollBarWidth = minimum.height;
+	minHScrollBarWidth = minimum.width;
 	horizontalScrollBarHeight = requisition.height;
 #else
 	minVScrollBarHeight = minHScrollBarWidth = 1;
-- 
cgit v1.2.3