=== modified file '3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp' --- 3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp 2016-04-17 22:35:32 +0000 +++ 3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp 2016-05-05 08:32:49 +0000 @@ -144,7 +144,11 @@ hboxDirChoice->Add( cfgPaths, 0, wxALL, 5 ); wxButton* btn_OK = new wxButton( this, wxID_OK, _T( "OK" ) ); - wxButton* btn_Cancel = new wxButton( this, wxID_CANCEL, _T( "Cancel" ) ); + wxButton* btn_Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); wxStdDialogButtonSizer* hSizer1 = new wxStdDialogButtonSizer(); hSizer1->AddButton( btn_OK ); === modified file '3d-viewer/dialogs/dialog_3D_view_option_base.cpp' --- 3d-viewer/dialogs/dialog_3D_view_option_base.cpp 2015-09-15 18:47:20 +0000 +++ 3d-viewer/dialogs/dialog_3D_view_option_base.cpp 2016-05-05 08:32:52 +0000 @@ -108,7 +108,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'common/dialogs/dialog_env_var_config_base.cpp' --- common/dialogs/dialog_env_var_config_base.cpp 2016-05-02 14:01:43 +0000 +++ common/dialogs/dialog_env_var_config_base.cpp 2016-05-05 08:32:52 +0000 @@ -78,7 +78,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizerHelp = new wxButton( this, wxID_HELP ); m_sdbSizer->AddButton( m_sdbSizerHelp ); === modified file 'common/dialogs/dialog_get_component_base.cpp' --- common/dialogs/dialog_get_component_base.cpp 2015-12-21 11:52:00 +0000 +++ common/dialogs/dialog_get_component_base.cpp 2016-05-05 08:32:52 +0000 @@ -66,7 +66,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'common/dialogs/dialog_hotkeys_editor_base.cpp' --- common/dialogs/dialog_hotkeys_editor_base.cpp 2016-03-29 16:35:24 +0000 +++ common/dialogs/dialog_hotkeys_editor_base.cpp 2016-05-05 08:32:52 +0000 @@ -37,7 +37,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'common/dialogs/dialog_image_editor_base.cpp' --- common/dialogs/dialog_image_editor_base.cpp 2013-05-26 04:36:44 +0000 +++ common/dialogs/dialog_image_editor_base.cpp 2016-05-05 08:32:52 +0000 @@ -65,7 +65,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT, 5 ); === modified file 'common/dialogs/dialog_list_selector_base.cpp' --- common/dialogs/dialog_list_selector_base.cpp 2014-11-19 14:22:47 +0000 +++ common/dialogs/dialog_list_selector_base.cpp 2016-05-05 08:32:52 +0000 @@ -46,7 +46,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'common/dialogs/dialog_page_settings_base.cpp' --- common/dialogs/dialog_page_settings_base.cpp 2015-06-15 13:54:58 +0000 +++ common/dialogs/dialog_page_settings_base.cpp 2016-05-05 08:32:52 +0000 @@ -371,7 +371,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'cvpcb/dialogs/dialog_config_equfiles_base.cpp' --- cvpcb/dialogs/dialog_config_equfiles_base.cpp 2016-02-25 13:57:59 +0000 +++ cvpcb/dialogs/dialog_config_equfiles_base.cpp 2016-05-05 08:32:52 +0000 @@ -113,7 +113,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'cvpcb/dialogs/dialog_display_options_base.cpp' --- cvpcb/dialogs/dialog_display_options_base.cpp 2016-05-02 14:01:43 +0000 +++ cvpcb/dialogs/dialog_display_options_base.cpp 2016-05-05 08:32:52 +0000 @@ -65,7 +65,11 @@ m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1Apply = new wxButton( this, wxID_APPLY ); m_sdbSizer1->AddButton( m_sdbSizer1Apply ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'cvpcb/dialogs/fp_conflict_assignment_selector_base.cpp' --- cvpcb/dialogs/fp_conflict_assignment_selector_base.cpp 2014-10-29 09:52:39 +0000 +++ cvpcb/dialogs/fp_conflict_assignment_selector_base.cpp 2016-05-05 08:32:52 +0000 @@ -26,7 +26,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'eeschema/dialogs/dialog_choose_component_base.cpp' --- eeschema/dialogs/dialog_choose_component_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_choose_component_base.cpp 2016-05-05 08:32:52 +0000 @@ -53,7 +53,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'eeschema/dialogs/dialog_edit_component_in_lib_base.cpp' --- eeschema/dialogs/dialog_edit_component_in_lib_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_edit_component_in_lib_base.cpp 2016-05-05 08:07:34 +0000 @@ -251,7 +251,11 @@ m_stdSizerButton = new wxStdDialogButtonSizer(); m_stdSizerButtonOK = new wxButton( this, wxID_OK ); m_stdSizerButton->AddButton( m_stdSizerButtonOK ); - m_stdSizerButtonCancel = new wxButton( this, wxID_CANCEL ); + m_stdSizerButtonCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdSizerButton->AddButton( m_stdSizerButtonCancel ); m_stdSizerButton->Realize(); === modified file 'eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp' --- eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp 2016-05-02 14:01:43 +0000 +++ eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp 2016-05-05 08:32:52 +0000 @@ -278,7 +278,11 @@ stdDialogButtonSizer = new wxStdDialogButtonSizer(); stdDialogButtonSizerOK = new wxButton( this, wxID_OK ); stdDialogButtonSizer->AddButton( stdDialogButtonSizerOK ); - stdDialogButtonSizerCancel = new wxButton( this, wxID_CANCEL ); + stdDialogButtonSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); stdDialogButtonSizer->AddButton( stdDialogButtonSizerCancel ); stdDialogButtonSizer->Realize(); === modified file 'eeschema/dialogs/dialog_edit_label_base.cpp' --- eeschema/dialogs/dialog_edit_label_base.cpp 2016-03-24 12:28:50 +0000 +++ eeschema/dialogs/dialog_edit_label_base.cpp 2016-05-05 08:32:52 +0000 @@ -91,7 +91,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp' --- eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp 2016-04-29 17:37:36 +0000 +++ eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp 2016-05-05 08:32:52 +0000 @@ -188,7 +188,11 @@ stdDialogButtonSizer = new wxStdDialogButtonSizer(); stdDialogButtonSizerOK = new wxButton( this, wxID_OK ); stdDialogButtonSizer->AddButton( stdDialogButtonSizerOK ); - stdDialogButtonSizerCancel = new wxButton( this, wxID_CANCEL ); + stdDialogButtonSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); stdDialogButtonSizer->AddButton( stdDialogButtonSizerCancel ); stdDialogButtonSizer->Realize(); === modified file 'eeschema/dialogs/dialog_eeschema_config_fbp.cpp' --- eeschema/dialogs/dialog_eeschema_config_fbp.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_eeschema_config_fbp.cpp 2016-05-05 08:32:52 +0000 @@ -126,7 +126,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'eeschema/dialogs/dialog_eeschema_options_base.cpp' --- eeschema/dialogs/dialog_eeschema_options_base.cpp 2016-02-24 19:53:02 +0000 +++ eeschema/dialogs/dialog_eeschema_options_base.cpp 2016-05-05 08:32:52 +0000 @@ -385,7 +385,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'eeschema/dialogs/dialog_erc_base.cpp' --- eeschema/dialogs/dialog_erc_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_erc_base.cpp 2016-05-05 08:32:40 +0000 @@ -98,7 +98,13 @@ m_buttonERC->SetDefault(); bbuttonsSizer->Add( m_buttonERC, 0, wxALL|wxEXPAND, 5 ); - m_buttonClose = new wxButton( m_PanelERC, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonClose = new wxButton( m_PanelERC, wxID_CANCEL, + #ifdef __APPLE__ + _("Close") + #else + _("&Close") + #endif + , wxDefaultPosition, wxDefaultSize, 0 ); bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 ); === modified file 'eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp' --- eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp 2016-05-05 08:32:52 +0000 @@ -119,7 +119,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'eeschema/dialogs/dialog_lib_edit_pin_base.cpp' --- eeschema/dialogs/dialog_lib_edit_pin_base.cpp 2016-02-28 17:33:29 +0000 +++ eeschema/dialogs/dialog_lib_edit_pin_base.cpp 2016-05-05 08:32:52 +0000 @@ -172,7 +172,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'eeschema/dialogs/dialog_lib_edit_text_base.cpp' --- eeschema/dialogs/dialog_lib_edit_text_base.cpp 2016-04-04 14:31:34 +0000 +++ eeschema/dialogs/dialog_lib_edit_text_base.cpp 2016-05-05 08:32:52 +0000 @@ -121,7 +121,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'eeschema/dialogs/dialog_lib_new_component_base.cpp' --- eeschema/dialogs/dialog_lib_new_component_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_lib_new_component_base.cpp 2016-05-05 08:32:52 +0000 @@ -127,7 +127,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'eeschema/dialogs/dialog_libedit_options_base.cpp' --- eeschema/dialogs/dialog_libedit_options_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_libedit_options_base.cpp 2016-05-05 08:32:52 +0000 @@ -174,7 +174,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'eeschema/dialogs/dialog_rescue_each_base.cpp' --- eeschema/dialogs/dialog_rescue_each_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_rescue_each_base.cpp 2016-05-05 08:32:52 +0000 @@ -90,7 +90,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp' --- eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp 2016-05-05 08:32:52 +0000 @@ -84,7 +84,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'eeschema/dialogs/dialog_sch_sheet_props_base.cpp' --- eeschema/dialogs/dialog_sch_sheet_props_base.cpp 2016-02-19 23:25:03 +0000 +++ eeschema/dialogs/dialog_sch_sheet_props_base.cpp 2016-05-05 08:32:52 +0000 @@ -113,7 +113,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp' --- gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp 2013-05-26 04:36:44 +0000 +++ gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp 2016-05-05 08:32:52 +0000 @@ -101,7 +101,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'gerbview/dialogs/dialog_show_page_borders_base.cpp' --- gerbview/dialogs/dialog_show_page_borders_base.cpp 2013-05-26 04:36:44 +0000 +++ gerbview/dialogs/dialog_show_page_borders_base.cpp 2016-05-05 08:32:52 +0000 @@ -40,7 +40,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp' --- gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp 2016-02-24 19:53:02 +0000 +++ gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp 2016-05-05 08:32:52 +0000 @@ -114,7 +114,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'kicad/dialogs/dialog_template_selector_base.cpp' --- kicad/dialogs/dialog_template_selector_base.cpp 2016-04-21 07:32:29 +0000 +++ kicad/dialogs/dialog_template_selector_base.cpp 2016-05-05 08:32:52 +0000 @@ -48,7 +48,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp' --- pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp 2013-07-31 16:41:32 +0000 +++ pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp 2016-05-05 08:32:52 +0000 @@ -131,7 +131,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'pcb_calculator/dialogs/dialog_regulator_data_base.cpp' --- pcb_calculator/dialogs/dialog_regulator_data_base.cpp 2016-01-16 14:27:42 +0000 +++ pcb_calculator/dialogs/dialog_regulator_data_base.cpp 2016-05-05 08:32:52 +0000 @@ -80,7 +80,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_block_options_base.cpp' --- pcbnew/dialogs/dialog_block_options_base.cpp 2015-08-06 18:40:22 +0000 +++ pcbnew/dialogs/dialog_block_options_base.cpp 2016-05-05 08:32:52 +0000 @@ -62,7 +62,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_cleaning_options_base.cpp' --- pcbnew/dialogs/dialog_cleaning_options_base.cpp 2015-08-06 18:40:22 +0000 +++ pcbnew/dialogs/dialog_cleaning_options_base.cpp 2016-05-05 08:32:52 +0000 @@ -43,7 +43,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_copper_zones_base.cpp' --- pcbnew/dialogs/dialog_copper_zones_base.cpp 2016-05-02 14:01:43 +0000 +++ pcbnew/dialogs/dialog_copper_zones_base.cpp 2016-05-05 08:32:52 +0000 @@ -256,7 +256,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_create_array_base.cpp' --- pcbnew/dialogs/dialog_create_array_base.cpp 2016-04-02 12:52:29 +0000 +++ pcbnew/dialogs/dialog_create_array_base.cpp 2016-05-05 08:32:52 +0000 @@ -278,7 +278,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_design_rules_base.cpp' --- pcbnew/dialogs/dialog_design_rules_base.cpp 2015-12-17 22:56:23 +0000 +++ pcbnew/dialogs/dialog_design_rules_base.cpp 2016-05-05 08:32:52 +0000 @@ -362,7 +362,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_dimension_editor_base.cpp' --- pcbnew/dialogs/dialog_dimension_editor_base.cpp 2015-08-01 21:30:38 +0000 +++ pcbnew/dialogs/dialog_dimension_editor_base.cpp 2016-05-05 08:32:52 +0000 @@ -105,7 +105,11 @@ m_sdbSizerBts = new wxStdDialogButtonSizer(); m_sdbSizerBtsOK = new wxButton( this, wxID_OK ); m_sdbSizerBts->AddButton( m_sdbSizerBtsOK ); - m_sdbSizerBtsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerBtsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerBts->AddButton( m_sdbSizerBtsCancel ); m_sdbSizerBts->Realize(); === modified file 'pcbnew/dialogs/dialog_display_options_base.cpp' --- pcbnew/dialogs/dialog_display_options_base.cpp 2015-09-10 20:29:45 +0000 +++ pcbnew/dialogs/dialog_display_options_base.cpp 2016-05-05 08:32:52 +0000 @@ -118,7 +118,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_drc_base.cpp' --- pcbnew/dialogs/dialog_drc_base.cpp 2016-04-15 18:15:22 +0000 +++ pcbnew/dialogs/dialog_drc_base.cpp 2016-05-05 08:32:52 +0000 @@ -204,7 +204,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp' --- pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp 2016-04-10 12:59:23 +0000 +++ pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp 2016-05-05 08:32:52 +0000 @@ -352,7 +352,11 @@ m_sdbSizerStdButtons = new wxStdDialogButtonSizer(); m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsOK ); - m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel ); m_sdbSizerStdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp' --- pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp 2016-03-02 02:36:24 +0000 +++ pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp 2016-05-05 08:32:52 +0000 @@ -296,7 +296,11 @@ m_sdbSizerStdButtons = new wxStdDialogButtonSizer(); m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsOK ); - m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel ); m_sdbSizerStdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_edit_module_text_base.cpp' --- pcbnew/dialogs/dialog_edit_module_text_base.cpp 2016-04-09 20:17:19 +0000 +++ pcbnew/dialogs/dialog_edit_module_text_base.cpp 2016-05-05 08:32:52 +0000 @@ -149,7 +149,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_enum_pads_base.cpp' --- pcbnew/dialogs/dialog_enum_pads_base.cpp 2015-06-15 13:54:58 +0000 +++ pcbnew/dialogs/dialog_enum_pads_base.cpp 2016-05-05 08:32:52 +0000 @@ -53,7 +53,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_export_idf_base.cpp' --- pcbnew/dialogs/dialog_export_idf_base.cpp 2015-09-10 19:48:28 +0000 +++ pcbnew/dialogs/dialog_export_idf_base.cpp 2016-05-05 08:32:52 +0000 @@ -101,7 +101,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_export_vrml_base.cpp' --- pcbnew/dialogs/dialog_export_vrml_base.cpp 2015-10-04 11:46:56 +0000 +++ pcbnew/dialogs/dialog_export_vrml_base.cpp 2016-05-05 08:32:52 +0000 @@ -137,7 +137,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp' --- pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp 2015-10-31 11:54:48 +0000 +++ pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp 2016-05-05 08:32:52 +0000 @@ -55,7 +55,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_fp_lib_table_base.cpp' --- pcbnew/dialogs/dialog_fp_lib_table_base.cpp 2015-03-30 16:42:39 +0000 +++ pcbnew/dialogs/dialog_fp_lib_table_base.cpp 2016-05-05 08:32:52 +0000 @@ -209,7 +209,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_fp_plugin_options_base.cpp' --- pcbnew/dialogs/dialog_fp_plugin_options_base.cpp 2015-06-15 13:54:58 +0000 +++ pcbnew/dialogs/dialog_fp_plugin_options_base.cpp 2016-05-05 08:32:52 +0000 @@ -116,7 +116,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_freeroute_exchange_base.cpp' --- pcbnew/dialogs/dialog_freeroute_exchange_base.cpp 2015-07-24 10:23:34 +0000 +++ pcbnew/dialogs/dialog_freeroute_exchange_base.cpp 2016-05-05 08:32:53 +0000 @@ -70,7 +70,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizerHelp = new wxButton( this, wxID_HELP ); m_sdbSizer->AddButton( m_sdbSizerHelp ); === modified file 'pcbnew/dialogs/dialog_gen_module_position_file_base.cpp' --- pcbnew/dialogs/dialog_gen_module_position_file_base.cpp 2016-04-26 12:16:16 +0000 +++ pcbnew/dialogs/dialog_gen_module_position_file_base.cpp 2016-05-05 08:32:53 +0000 @@ -96,7 +96,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp' --- pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp 2016-02-24 19:53:02 +0000 +++ pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp 2016-05-05 08:32:53 +0000 @@ -211,7 +211,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp' --- pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp 2015-12-20 18:47:52 +0000 +++ pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp 2016-05-05 08:32:53 +0000 @@ -53,7 +53,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_global_deletion_base.cpp' --- pcbnew/dialogs/dialog_global_deletion_base.cpp 2015-09-10 20:00:18 +0000 +++ pcbnew/dialogs/dialog_global_deletion_base.cpp 2016-05-05 08:32:53 +0000 @@ -114,7 +114,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp' --- pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp 2013-05-26 04:36:44 +0000 +++ pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp 2016-05-05 08:32:53 +0000 @@ -158,7 +158,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp' --- pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp 2016-02-11 15:02:37 +0000 +++ pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp 2016-05-05 08:32:53 +0000 @@ -112,7 +112,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_graphic_item_properties_base.cpp' --- pcbnew/dialogs/dialog_graphic_item_properties_base.cpp 2016-04-11 14:27:32 +0000 +++ pcbnew/dialogs/dialog_graphic_item_properties_base.cpp 2016-05-05 08:32:53 +0000 @@ -144,7 +144,11 @@ m_StandardButtonsSizer = new wxStdDialogButtonSizer(); m_StandardButtonsSizerOK = new wxButton( this, wxID_OK ); m_StandardButtonsSizer->AddButton( m_StandardButtonsSizerOK ); - m_StandardButtonsSizerCancel = new wxButton( this, wxID_CANCEL ); + m_StandardButtonsSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_StandardButtonsSizer->AddButton( m_StandardButtonsSizerCancel ); m_StandardButtonsSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_graphic_items_options_base.cpp' --- pcbnew/dialogs/dialog_graphic_items_options_base.cpp 2015-09-11 14:31:45 +0000 +++ pcbnew/dialogs/dialog_graphic_items_options_base.cpp 2016-05-05 08:32:53 +0000 @@ -128,7 +128,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_keepout_area_properties_base.cpp' --- pcbnew/dialogs/dialog_keepout_area_properties_base.cpp 2015-09-21 15:36:13 +0000 +++ pcbnew/dialogs/dialog_keepout_area_properties_base.cpp 2016-05-05 08:32:53 +0000 @@ -83,7 +83,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_layer_selection_base.cpp' --- pcbnew/dialogs/dialog_layer_selection_base.cpp 2016-02-10 16:02:40 +0000 +++ pcbnew/dialogs/dialog_layer_selection_base.cpp 2016-05-05 08:32:53 +0000 @@ -194,7 +194,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_layers_setup_base.cpp' --- pcbnew/dialogs/dialog_layers_setup_base.cpp 2015-06-15 13:54:58 +0000 +++ pcbnew/dialogs/dialog_layers_setup_base.cpp 2016-05-05 08:32:53 +0000 @@ -1503,7 +1503,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_mask_clearance_base.cpp' --- pcbnew/dialogs/dialog_mask_clearance_base.cpp 2015-06-15 13:54:58 +0000 +++ pcbnew/dialogs/dialog_mask_clearance_base.cpp 2016-05-05 08:32:53 +0000 @@ -114,7 +114,11 @@ m_sdbButtonsSizer = new wxStdDialogButtonSizer(); m_sdbButtonsSizerOK = new wxButton( this, wxID_OK ); m_sdbButtonsSizer->AddButton( m_sdbButtonsSizerOK ); - m_sdbButtonsSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbButtonsSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbButtonsSizer->AddButton( m_sdbButtonsSizerCancel ); m_sdbButtonsSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_modedit_options_base.cpp' --- pcbnew/dialogs/dialog_modedit_options_base.cpp 2015-08-06 18:40:22 +0000 +++ pcbnew/dialogs/dialog_modedit_options_base.cpp 2016-05-05 08:32:53 +0000 @@ -199,7 +199,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_move_exact_base.cpp' --- pcbnew/dialogs/dialog_move_exact_base.cpp 2015-10-20 18:03:07 +0000 +++ pcbnew/dialogs/dialog_move_exact_base.cpp 2016-05-05 08:32:53 +0000 @@ -76,7 +76,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp' --- pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp 2015-06-15 13:54:58 +0000 +++ pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp 2016-05-05 08:32:53 +0000 @@ -78,7 +78,11 @@ m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); - m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_pad_properties_base.cpp' --- pcbnew/dialogs/dialog_pad_properties_base.cpp 2016-04-10 22:14:28 +0000 +++ pcbnew/dialogs/dialog_pad_properties_base.cpp 2016-05-05 08:32:53 +0000 @@ -581,7 +581,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_pcb_text_properties_base.cpp' --- pcbnew/dialogs/dialog_pcb_text_properties_base.cpp 2016-04-19 18:35:47 +0000 +++ pcbnew/dialogs/dialog_pcb_text_properties_base.cpp 2016-05-05 08:32:53 +0000 @@ -140,7 +140,11 @@ m_StandardSizer = new wxStdDialogButtonSizer(); m_StandardSizerOK = new wxButton( this, wxID_OK ); m_StandardSizer->AddButton( m_StandardSizerOK ); - m_StandardSizerCancel = new wxButton( this, wxID_CANCEL ); + m_StandardSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_StandardSizer->AddButton( m_StandardSizerCancel ); m_StandardSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp' --- pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp 2015-05-03 18:43:07 +0000 +++ pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp 2016-05-05 08:32:53 +0000 @@ -77,7 +77,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp' --- pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp 2015-06-15 13:54:58 +0000 +++ pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp 2016-05-05 08:32:53 +0000 @@ -160,7 +160,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_pns_settings_base.cpp' --- pcbnew/dialogs/dialog_pns_settings_base.cpp 2015-10-16 15:56:50 +0000 +++ pcbnew/dialogs/dialog_pns_settings_base.cpp 2016-05-05 08:32:53 +0000 @@ -137,7 +137,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_select_net_from_list_base.cpp' --- pcbnew/dialogs/dialog_select_net_from_list_base.cpp 2016-03-16 14:14:00 +0000 +++ pcbnew/dialogs/dialog_select_net_from_list_base.cpp 2016-05-05 08:32:53 +0000 @@ -75,7 +75,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_select_pretty_lib_base.cpp' --- pcbnew/dialogs/dialog_select_pretty_lib_base.cpp 2016-05-02 10:49:14 +0000 +++ pcbnew/dialogs/dialog_select_pretty_lib_base.cpp 2016-05-05 08:32:53 +0000 @@ -47,7 +47,11 @@ m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); === modified file 'pcbnew/dialogs/dialog_set_grid_base.cpp' --- pcbnew/dialogs/dialog_set_grid_base.cpp 2016-05-02 14:15:24 +0000 +++ pcbnew/dialogs/dialog_set_grid_base.cpp 2016-05-05 08:32:53 +0000 @@ -141,7 +141,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/dialogs/dialog_target_properties_base.cpp' --- pcbnew/dialogs/dialog_target_properties_base.cpp 2015-06-15 13:54:58 +0000 +++ pcbnew/dialogs/dialog_target_properties_base.cpp 2016-05-05 08:32:53 +0000 @@ -72,7 +72,11 @@ m_sdbSizerButts = new wxStdDialogButtonSizer(); m_sdbSizerButtsOK = new wxButton( this, wxID_OK ); m_sdbSizerButts->AddButton( m_sdbSizerButtsOK ); - m_sdbSizerButtsCancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizerButtsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizerButts->AddButton( m_sdbSizerButtsCancel ); m_sdbSizerButts->Realize(); === modified file 'pcbnew/dialogs/dialog_track_via_properties_base.cpp' --- pcbnew/dialogs/dialog_track_via_properties_base.cpp 2015-09-11 14:02:57 +0000 +++ pcbnew/dialogs/dialog_track_via_properties_base.cpp 2016-05-05 08:32:53 +0000 @@ -207,7 +207,11 @@ m_StdButtons = new wxStdDialogButtonSizer(); m_StdButtonsOK = new wxButton( this, wxID_OK ); m_StdButtons->AddButton( m_StdButtonsOK ); - m_StdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_StdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_StdButtons->AddButton( m_StdButtonsCancel ); m_StdButtons->Realize(); === modified file 'pcbnew/dialogs/dialog_track_via_size_base.cpp' --- pcbnew/dialogs/dialog_track_via_size_base.cpp 2015-06-15 13:54:58 +0000 +++ pcbnew/dialogs/dialog_track_via_size_base.cpp 2016-05-05 08:32:53 +0000 @@ -61,7 +61,11 @@ m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); - m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); + m_stdButtonsCancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); === modified file 'pcbnew/import_dxf/dialog_dxf_import_base.cpp' --- pcbnew/import_dxf/dialog_dxf_import_base.cpp 2015-08-27 18:10:28 +0000 +++ pcbnew/import_dxf/dialog_dxf_import_base.cpp 2016-05-05 08:09:51 +0000 @@ -123,7 +123,11 @@ m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL + #ifdef __APPLE__ + , _T( "Cancel" ) + #endif + ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); === modified file 'pcbnew/swap_layers.cpp' --- pcbnew/swap_layers.cpp 2015-11-04 08:48:34 +0000 +++ pcbnew/swap_layers.cpp 2016-05-05 08:36:14 +0000 @@ -285,8 +285,13 @@ Button->SetDefault(); StdDialogButtonSizer->AddButton( Button ); - Button = new wxButton( this, wxID_CANCEL, _( "&Cancel" ), - wxDefaultPosition, wxDefaultSize, 0 ); + Button = new wxButton( this, wxID_CANCEL, + #ifdef __APPLE__ + _( "Cancel" ), + #else + _( "&Cancel"), + #endif + wxDefaultPosition, wxDefaultSize, 0 ); StdDialogButtonSizer->AddButton( Button ); StdDialogButtonSizer->Realize();