haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX: Corrected issue with Menus, workaround/fix for an issue with Mountain Lion

This commit is contained in:
marco. 2012-10-13 20:23:03 +02:00
parent fc9c8cc0ec
commit eee9738755
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/edaappl.cpp
View File

@ -656,7 +656,10 @@ void EDA_APP::GetSettings( bool aReopenLastUsedDirectory )
} }
int draw_bg_color; 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 ); g_DrawBgColor = ColorFromInt( draw_bg_color );
// Load per-user search paths from settings file // Load per-user search paths from settings file

4
eeschema/eeschema_id.h
View File

@ -51,12 +51,12 @@
enum id_eeschema_frm enum id_eeschema_frm
{ {
ID_UPDATE_ONE_SHEET, ID_UPDATE_ONE_SHEET = ID_END_LIST,
ID_SAVE_ONE_SHEET_UNDER_NEW_NAME, ID_SAVE_ONE_SHEET_UNDER_NEW_NAME,
ID_LOAD_ONE_SHEET, ID_LOAD_ONE_SHEET,
/* Schematic editor horizontal toolbar IDs */ /* Schematic editor horizontal toolbar IDs */
ID_HIERARCHY = ID_END_LIST, ID_HIERARCHY,
ID_TO_LIBVIEW, ID_TO_LIBVIEW,
ID_GET_ANNOTATE, ID_GET_ANNOTATE,
ID_GET_ERC, ID_GET_ERC,