mirror of
https://github.com/cookiengineer/audacity
synced 2026-03-11 08:56:03 +01:00
Merge remote-tracking branch 'upstream/master' into wx3
This commit is contained in:
@@ -20,12 +20,15 @@ KeyConfigPrefs and MousePrefs use.
|
||||
*//*********************************************************************/
|
||||
|
||||
#include "../Audacity.h"
|
||||
#include "../Experimental.h"
|
||||
#include "KeyConfigPrefs.h"
|
||||
|
||||
#include <wx/defs.h>
|
||||
#include <wx/ffile.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/filedlg.h>
|
||||
#include <wx/button.h>
|
||||
#include <wx/msgdlg.h>
|
||||
|
||||
#include "../Prefs.h"
|
||||
#include "../Project.h"
|
||||
@@ -35,7 +38,6 @@ KeyConfigPrefs and MousePrefs use.
|
||||
|
||||
#include "../Internat.h"
|
||||
#include "../ShuttleGui.h"
|
||||
#include "KeyConfigPrefs.h"
|
||||
|
||||
#include "FileDialog.h"
|
||||
|
||||
@@ -1211,3 +1213,8 @@ void KeyConfigPrefs::Cancel()
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
PrefsPanel *KeyConfigPrefsFactory::Create(wxWindow *parent)
|
||||
{
|
||||
return new KeyConfigPrefs(parent);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user