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

Fix the mac application menubar preferences default OS X shortcut

This commit is contained in:
Jerry Jacobs 2011-08-30 15:54:22 +02:00
parent 2571080ef2
commit 3cc37e83b9
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/menubar.cpp
View File

@ -401,15 +401,17 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
palette_xpm ); palette_xpm );
// Options (Preferences on WXMAC) // Options (Preferences on WXMAC)
#ifdef __WXMAC__
preferencesMenu->Append(wxID_PREFERENCES);
#else
ADD_MENUITEM_WITH_HELP( preferencesMenu, ADD_MENUITEM_WITH_HELP( preferencesMenu,
wxID_PREFERENCES, wxID_PREFERENCES,
#ifdef __WXMAC__
_( "&Preferences..." ),
#else
_( "&Options" ), _( "&Options" ),
#endif // __WXMAC__
_( "EESchema preferences" ), _( "EESchema preferences" ),
preference_xpm ); preference_xpm );
#endif // __WXMAC__
// Language submenu // Language submenu
wxGetApp().AddMenuLanguageList( preferencesMenu ); wxGetApp().AddMenuLanguageList( preferencesMenu );

10
gerbview/menubar.cpp
View File

@ -133,15 +133,17 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
layers_manager_xpm ); layers_manager_xpm );
// Options (Preferences on WXMAC) // Options (Preferences on WXMAC)
#ifdef __WXMAC__
configMenu->Append(wxID_PREFERENCES);
#else
ADD_MENUITEM_WITH_HELP( configMenu, ADD_MENUITEM_WITH_HELP( configMenu,
wxID_PREFERENCES, wxID_PREFERENCES,
#ifdef __WXMAC__
_( "Preferences..." ),
#else
_( "&Options" ), _( "&Options" ),
#endif // __WXMAC__
_( "Set options to draw items" ), _( "Set options to draw items" ),
preference_xpm ); preference_xpm );
#endif // __WXMAC__
// Language submenu // Language submenu
wxGetApp().AddMenuLanguageList( configMenu ); wxGetApp().AddMenuLanguageList( configMenu );

7
pcbnew/menubar_pcbframe.cpp
View File

@ -497,17 +497,16 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
configmenu->Append( item ); configmenu->Append( item );
// General // General
item = new wxMenuItem( configmenu, wxID_PREFERENCES,
#ifdef __WXMAC__ #ifdef __WXMAC__
_( "&Preferences..." ), configmenu->Append(wxID_PREFERENCES);
#else #else
item = new wxMenuItem( configmenu, wxID_PREFERENCES,
_( "&General" ), _( "&General" ),
#endif
_( "Select general options for PCBnew" ) ); _( "Select general options for PCBnew" ) );
SET_BITMAP( preference_xpm ); SET_BITMAP( preference_xpm );
configmenu->Append( item ); configmenu->Append( item );
#endif
// Display // Display
item = new wxMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP, item = new wxMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP,