From a8671869e5159e1f2308b44cbdc3bdcb39ba8be4 Mon Sep 17 00:00:00 2001
From: Jake Nelson <jake.nelson@gmail.com>
Date: Wed, 22 Nov 2017 23:23:42 +0100
Subject: [PATCH] Fix wxButton::SetBitmapPosition() with GTK+ 3

Make the check for GTK+ >= 2.10 pass for GTK+ 3 too by simply not making
it in this case.

Closes #18004.
---
 3rdparty/catch        | 2 +-
 docs/changes.txt      | 1 +
 src/gtk/anybutton.cpp | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/3rdparty/catch b/3rdparty/catch
index 2d91035404..011f6e6458 160000
--- a/3rdparty/catch
+++ b/3rdparty/catch
@@ -1 +1 @@
-Subproject commit 2d91035404884089d1faf038300e437963e0c2a4
+Subproject commit 011f6e6458d888246f94643e293f002073cff489
diff --git a/docs/changes.txt b/docs/changes.txt
index 45ac3db7ad..72b26c71b3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -173,6 +173,7 @@ wxGTK:
 - Make wxBORDER_NONE work for wxTextCtrl with GTK+ 3 (Adrien Tétar).
 - Apply wxTextCtrl::SetDefaultStyle() to user-entered text (Andreas Falkenhahn).
 - Fix wxTextCtrl::GetStyle() with GTK+ 3.
+- Fix wxButton::SetBitmapPosition() with GTK+ 3 (Jake Nelson).
 - Support background colour in wxDataViewCtrl attributes.
 - Improve wxSpinCtrl best size calculation.
 - Implement support for icon locations in wxMimeTypesManager (Hanmac).
diff --git a/src/gtk/anybutton.cpp b/src/gtk/anybutton.cpp
index 16e7b4a22d..b775268cc9 100644
--- a/src/gtk/anybutton.cpp
+++ b/src/gtk/anybutton.cpp
@@ -389,7 +389,9 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 void wxAnyButton::DoSetBitmapPosition(wxDirection dir)
 {
 #ifdef __WXGTK210__
+#ifndef __WXGTK3__
     if ( !gtk_check_version(2,10,0) )
+#endif
     {
         GtkPositionType gtkpos;
         switch ( dir )