1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 06:01:13 +02:00

Change affirmative button label to OK for modal dialogs

This commit is contained in:
Leland Lucius
2015-04-27 13:16:08 -05:00
parent 2d5a68e4a4
commit e684fe9e1f
2 changed files with 9 additions and 9 deletions

View File

@@ -24,12 +24,13 @@ greater use in future.
#include "../Audacity.h" #include "../Audacity.h"
#include <wx/defs.h> #include <wx/defs.h>
#include <wx/string.h> #include <wx/hashmap.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/timer.h> #include <wx/stockitem.h>
#include <wx/string.h>
#include <wx/tglbtn.h> #include <wx/tglbtn.h>
#include <wx/hashmap.h> #include <wx/timer.h>
#include <wx/utils.h> #include <wx/utils.h>
#include "audacity/ConfigInterface.h" #include "audacity/ConfigInterface.h"
@@ -2738,15 +2739,17 @@ bool EffectUIHost::TransferDataFromWindow()
// wxDialog implementation // wxDialog implementation
// ============================================================================ // ============================================================================
#if defined(__WXMAC__)
// See explanation in EffectUIHost::Show()
int EffectUIHost::ShowModal() int EffectUIHost::ShowModal()
{ {
#if defined(__WXMAC__)
// See explanation in EffectUIHost::Show()
mIsModal = true; mIsModal = true;
#endif
mApplyBtn->SetLabel(wxGetStockLabel(wxID_OK));
return wxDialog::ShowModal(); return wxDialog::ShowModal();
} }
#endif
// ============================================================================ // ============================================================================
// EffectUIHost implementation // EffectUIHost implementation
@@ -3659,7 +3662,6 @@ void EffectPresetsDialog::SetPrefix(const wxString & type, const wxString & pref
{ {
mType->SetStringSelection(type); mType->SetStringSelection(type);
int selected;
if (type.IsSameAs(_("User Presets"))) if (type.IsSameAs(_("User Presets")))
{ {
mPresets->Clear(); mPresets->Clear();

View File

@@ -480,9 +480,7 @@ public:
virtual bool TransferDataToWindow(); virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow(); virtual bool TransferDataFromWindow();
#if defined(__WXMAC__)
virtual int ShowModal(); virtual int ShowModal();
#endif
bool Initialize(); bool Initialize();