From 5f0d26cbe21e333baee7f917ec98e5b5aee8c561 Mon Sep 17 00:00:00 2001
From: J RB <jon.roadleybattin@gmail.com>
Date: Fri, 16 Dec 2022 22:40:37 +0000
Subject: [PATCH] Remove argument to wxButton::GetDefaultSize on wxGTK-3.0.x

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13181
---
 common/widgets/split_button.cpp      | 7 ++++++-
 common/widgets/std_bitmap_button.cpp | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/widgets/split_button.cpp b/common/widgets/split_button.cpp
index b3f43a8a3b..5b14e9cecb 100644
--- a/common/widgets/split_button.cpp
+++ b/common/widgets/split_button.cpp
@@ -30,6 +30,7 @@
 #include <wx/menu.h>
 #include <wx/renderer.h>
 #include <wx/settings.h>
+#include <wx/version.h> 
 #include <kiplatform/ui.h>
 
 SPLIT_BUTTON::SPLIT_BUTTON( wxWindow* aParent, wxWindowID aId, const wxString& aLabel,
@@ -39,7 +40,11 @@ SPLIT_BUTTON::SPLIT_BUTTON( wxWindow* aParent, wxWindowID aId, const wxString& a
 {
     if( aSize == wxDefaultSize )
     {
-        wxSize defaultSize = wxButton::GetDefaultSize( aParent );
+        #if wxCHECK_VERSION( 3, 1, 3 )
+            wxSize defaultSize = wxButton::GetDefaultSize( aParent );
+        #else 
+            wxSize defaultSize = wxButton::GetDefaultSize();
+        #endif
 
         wxSize textSize = GetTextExtent( m_label );
         SetMinSize( wxSize( std::max( textSize.GetWidth(), defaultSize.GetWidth() + 1 ),
diff --git a/common/widgets/std_bitmap_button.cpp b/common/widgets/std_bitmap_button.cpp
index f6b546321c..88c3c2cff0 100644
--- a/common/widgets/std_bitmap_button.cpp
+++ b/common/widgets/std_bitmap_button.cpp
@@ -29,6 +29,7 @@
 #include <wx/menu.h>
 #include <wx/renderer.h>
 #include <wx/settings.h>
+#include <wx/version.h> 
 #include <kiplatform/ui.h>
 
 
@@ -39,7 +40,11 @@ STD_BITMAP_BUTTON::STD_BITMAP_BUTTON( wxWindow* aParent, wxWindowID aId,
 {
     if( aSize == wxDefaultSize )
     {
-        wxSize defaultSize = wxButton::GetDefaultSize( aParent );
+        #if wxCHECK_VERSION( 3, 1, 3 )
+            wxSize defaultSize = wxButton::GetDefaultSize( aParent );
+        #else 
+            wxSize defaultSize = wxButton::GetDefaultSize();
+        #endif
 
         SetMinSize( wxSize( defaultSize.GetWidth() + 1, defaultSize.GetHeight() + 1 ) );
     }