From b573315e7fbadd16c4eae3e98cd0bb448688c554 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 09:41:26 -0800
Subject: [PATCH] Add wx_is_at_least_gtk3() helper

---
 include/wx/gtk/private/gtk3-compat.h | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/wx/gtk/private/gtk3-compat.h b/include/wx/gtk/private/gtk3-compat.h
index 19e9626b15..56e889ed26 100644
--- a/include/wx/gtk/private/gtk3-compat.h
+++ b/include/wx/gtk/private/gtk3-compat.h
@@ -23,8 +23,6 @@ static inline gboolean wx_gtk_text_iter_starts_tag(const GtkTextIter* iter, GtkT
 }
 #define gtk_text_iter_starts_tag wx_gtk_text_iter_starts_tag
 
-#endif // !__WXGTK4__
-
 #ifdef __WXGTK3__
 
 // ----------------------------------------------------------------------------
@@ -43,7 +41,24 @@ static inline void wx_gtk_widget_set_margin_end(GtkWidget* widget, gint margin)
 #define gtk_widget_set_margin_end wx_gtk_widget_set_margin_end
 
 #endif // __WXGTK3__
+#endif // !__WXGTK4__
 
 wxGCC_WARNING_RESTORE()
 
+#if defined(__WXGTK4__) || !defined(__WXGTK3__)
+static inline bool wx_is_at_least_gtk3(int /* minor */)
+{
+#ifdef __WXGTK4__
+    return true;
+#else
+    return false;
+#endif
+}
+#else
+static inline bool wx_is_at_least_gtk3(int minor)
+{
+    return gtk_check_version(3, minor, 0) == NULL;
+}
+#endif
+
 #endif // _WX_GTK_PRIVATE_COMPAT3_H_