From 2b34426c3627c415209a90c1396d1f72bd2a2fc8 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 6 Mar 2018 20:30:15 +0000 Subject: [PATCH] Only set always-show-scrollbars in constructor on Mac. Fixes: lp:1753592 * https://bugs.launchpad.net/kicad/+bug/1753592 --- common/draw_panel.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/draw_panel.cpp b/common/draw_panel.cpp index 02b5d4541d..104e373b18 100644 --- a/common/draw_panel.cpp +++ b/common/draw_panel.cpp @@ -97,9 +97,15 @@ END_EVENT_TABLE() /* EDA_DRAW_PANEL base functions (EDA_DRAW_PANEL is the main panel)*/ /***********************************************************************/ +#ifdef __WXMAC__ +const int drawPanelStyle = wxBORDER | wxHSCROLL | wxVSCROLL | wxALWAYS_SHOW_SB; +#else +const int drawPanelStyle = wxBORDER | wxHSCROLL | wxVSCROLL; +#endif + EDA_DRAW_PANEL::EDA_DRAW_PANEL( EDA_DRAW_FRAME* parent, int id, const wxPoint& pos, const wxSize& size ) : - wxScrolledWindow( parent, id, pos, size, wxBORDER | wxHSCROLL | wxVSCROLL | wxALWAYS_SHOW_SB ) + wxScrolledWindow( parent, id, pos, size, drawPanelStyle ) { wxASSERT( parent );