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

Use "Cancel" for cancel semantics, even when affirmitave to question. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11983
This commit is contained in:
Jeff Young 2022-07-24 08:46:19 +01:00
parent 74b9ff5865
commit 6eada34f41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/confirm.cpp
View File

@ -157,16 +157,16 @@ bool OverrideLock( wxWindow* aParent, const wxString& aMessage )
// wxMessageDialog gets the button spacing wrong on Mac so we have to use wxRichMessageDialog. // wxMessageDialog gets the button spacing wrong on Mac so we have to use wxRichMessageDialog.
// Note that its warning icon is more like wxMessageDialog's error icon, so we use it instead // Note that its warning icon is more like wxMessageDialog's error icon, so we use it instead
// of wxICON_ERROR. // of wxICON_ERROR.
wxRichMessageDialog dlg( aParent, aMessage, _( "File Open Error" ), wxRichMessageDialog dlg( aParent, aMessage, _( "File Open Warning" ),
wxYES_NO | wxICON_WARNING | wxCENTER ); wxYES_NO | wxICON_WARNING | wxCENTER );
dlg.SetExtendedMessage( _( "Interleaved saves may produce very unexpected results." ) dlg.SetExtendedMessage( _( "Interleaved saves may produce very unexpected results." )
+ wxS( "\n" ) ); + wxS( "\n" ) );
dlg.SetYesNoLabels( _( "OK" ), _( "Open Anyway" ) ); dlg.SetYesNoLabels( _( "Cancel" ), _( "Open Anyway" ) );
#else #else
wxMessageDialog dlg( aParent, aMessage, _( "File Open Error" ), wxMessageDialog dlg( aParent, aMessage, _( "File Open Warning" ),
wxYES_NO | wxICON_ERROR | wxCENTER ); wxYES_NO | wxICON_ERROR | wxCENTER );
dlg.SetExtendedMessage( _( "Interleaved saves may produce very unexpected results." ) ); dlg.SetExtendedMessage( _( "Interleaved saves may produce very unexpected results." ) );
dlg.SetYesNoLabels( _( "OK" ), _( "Open Anyway" ) ); dlg.SetYesNoLabels( _( "Cancel" ), _( "Open Anyway" ) );
#endif #endif
return dlg.ShowModal() == wxID_NO; return dlg.ShowModal() == wxID_NO;