From 41b8ef85e38d67371691940c7e911e63df978385 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 22 Feb 2021 10:42:13 +0000 Subject: [PATCH] Fix preferences on OSX. --- common/widgets/gal_options_panel.cpp | 4 ++++ include/widgets/gal_options_panel.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/common/widgets/gal_options_panel.cpp b/common/widgets/gal_options_panel.cpp index ae656d433b..dc258b422f 100644 --- a/common/widgets/gal_options_panel.cpp +++ b/common/widgets/gal_options_panel.cpp @@ -208,10 +208,12 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFr bool GAL_OPTIONS_PANEL::TransferDataToWindow() { +#ifndef __WXMAC__ if( m_drawFrame->GetCanvas()->GetBackend() == EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) m_renderingEngine->SetSelection( 0 ); else m_renderingEngine->SetSelection( 1 ); +#endif m_gridSnapOptions->SetSelection( UTIL::GetConfigForVal( gridSnapConfigVals, m_galOptions.m_gridSnapping ) ); @@ -247,6 +249,7 @@ bool GAL_OPTIONS_PANEL::TransferDataFromWindow() m_galOptions.m_forceDisplayCursor = m_forceCursorDisplay->GetValue(); +#ifndef __WXMAC__ EDA_DRAW_PANEL_GAL::GAL_TYPE wantedType = m_renderingEngine->GetSelection() == 0 ? EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL : EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO; @@ -254,6 +257,7 @@ bool GAL_OPTIONS_PANEL::TransferDataFromWindow() if( wantedType != currentType ) m_drawFrame->GetCanvas()->SwitchBackend( wantedType ); +#endif return true; } diff --git a/include/widgets/gal_options_panel.h b/include/widgets/gal_options_panel.h index 3d9305703b..5ae8e8c6c1 100644 --- a/include/widgets/gal_options_panel.h +++ b/include/widgets/gal_options_panel.h @@ -55,7 +55,9 @@ private: wxBoxSizer* m_mainSizer; +#ifndef __WXMAC__ wxRadioBox* m_renderingEngine; +#endif wxRadioBox* m_gridStyle; wxStaticText* l_gridLineWidth;