From cc99323c863902579a7d4060e0a73235d3e57025 Mon Sep 17 00:00:00 2001
From: Julian Fellinger <6799153-canwail@users.noreply.gitlab.com>
Date: Fri, 6 Aug 2021 16:39:11 +0200
Subject: [PATCH] Gerbview: use native tab widget Fixes
 https://gitlab.com/kicad/code/kicad/-/issues/8903

---
 gerbview/widgets/layer_widget.cpp | 8 ++------
 gerbview/widgets/layer_widget.h   | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gerbview/widgets/layer_widget.cpp b/gerbview/widgets/layer_widget.cpp
index 7e3e6bca32..1b515a093c 100644
--- a/gerbview/widgets/layer_widget.cpp
+++ b/gerbview/widgets/layer_widget.cpp
@@ -505,18 +505,14 @@ LAYER_WIDGET::LAYER_WIDGET( wxWindow* aParent, wxWindow* aFocusOwner, wxWindowID
 
     wxBoxSizer* mainSizer = new wxBoxSizer( wxVERTICAL );
 
-    m_notebook = new wxAuiNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                    wxAUI_NB_TOP );
+    m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP );
 
     wxFont font = m_notebook->GetFont();
 
     // change the font size on the notebook's tabs to match aPointSize
     font.SetPointSize( pointSize );
     m_notebook->SetFont( font );
-    m_notebook->SetNormalFont( font );
-    m_notebook->SetSelectedFont( font );
-    m_notebook->SetMeasuringFont( font );
-
+    
     m_LayerPanel = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                 wxTAB_TRAVERSAL );
 
diff --git a/gerbview/widgets/layer_widget.h b/gerbview/widgets/layer_widget.h
index d4f085ccf4..27068f6ccc 100644
--- a/gerbview/widgets/layer_widget.h
+++ b/gerbview/widgets/layer_widget.h
@@ -457,7 +457,7 @@ protected:
         ID_LAST_VALUE
     };
 
-    wxAuiNotebook*      m_notebook;
+    wxNotebook*         m_notebook;
     wxPanel*            m_LayerPanel;
     wxScrolledWindow*   m_LayerScrolledWindow;
     wxFlexGridSizer*    m_LayersFlexGridSizer;