From eee9738755a6a2ea32345ba6b7f928d35b87540a Mon Sep 17 00:00:00 2001 From: "marco." Date: Sat, 13 Oct 2012 20:23:03 +0200 Subject: [PATCH] OSX: Corrected issue with Menus, workaround/fix for an issue with Mountain Lion --- common/edaappl.cpp | 5 ++++- eeschema/eeschema_id.h | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/edaappl.cpp b/common/edaappl.cpp index 7b784df4ac..bfd76267fe 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -656,7 +656,10 @@ void EDA_APP::GetSettings( bool aReopenLastUsedDirectory ) } int draw_bg_color; - m_settings->Read( wxT( "BgColor" ), &draw_bg_color ); + // FIXME OSX Mountain Lion (10.8) + // Seems that Read doesn't found anything and ColorFromInt Asserts - I'm unable to reproduce on 10.7 + // In general terms i think is better have a failsafe BLACK default than an uninit variable + m_settings->Read( wxT( "BgColor" ), &draw_bg_color , BLACK ); g_DrawBgColor = ColorFromInt( draw_bg_color ); // Load per-user search paths from settings file diff --git a/eeschema/eeschema_id.h b/eeschema/eeschema_id.h index acedd1ec5c..efb55ebacc 100644 --- a/eeschema/eeschema_id.h +++ b/eeschema/eeschema_id.h @@ -51,12 +51,12 @@ enum id_eeschema_frm { - ID_UPDATE_ONE_SHEET, + ID_UPDATE_ONE_SHEET = ID_END_LIST, ID_SAVE_ONE_SHEET_UNDER_NEW_NAME, ID_LOAD_ONE_SHEET, /* Schematic editor horizontal toolbar IDs */ - ID_HIERARCHY = ID_END_LIST, + ID_HIERARCHY, ID_TO_LIBVIEW, ID_GET_ANNOTATE, ID_GET_ERC,