Fix broken default icons in menus setting for OSX.

This commit is contained in:
Wayne Stambaugh 2017-09-13 12:59:42 -04:00
parent 50c9d8f77d
commit 33cc7b3f99
1 changed files with 3 additions and 1 deletions

View File

@ -611,6 +611,8 @@ void PGM_BASE::loadCommonSettings()
m_help_size.y = 400; m_help_size.y = 400;
m_iconsScale = 1.0; m_iconsScale = 1.0;
// This only effect the first time KiCad is run. The user's setting will be used for all
// subsequent runs. Menu icons are off by default on OSX and on for all other platforms.
#if defined( __WXMAC__ ) #if defined( __WXMAC__ )
m_useIconsInMenus = false; m_useIconsInMenus = false;
#else #else
@ -618,7 +620,7 @@ void PGM_BASE::loadCommonSettings()
#endif #endif
m_common_settings->Read( showEnvVarWarningDialog, &m_show_env_var_dialog ); m_common_settings->Read( showEnvVarWarningDialog, &m_show_env_var_dialog );
m_common_settings->Read( entryUseIconsInMenus, &m_useIconsInMenus, true ); m_common_settings->Read( entryUseIconsInMenus, &m_useIconsInMenus, m_useIconsInMenus );
m_editor_name = m_common_settings->Read( wxT( "Editor" ) ); m_editor_name = m_common_settings->Read( wxT( "Editor" ) );