1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-16 09:31:14 +01:00

Round 4 of wx3 changes

This gets FileDialog updated and working on Windows.  It also
removes removes the "wx3" build configurations and makes the default
Debug and Release builds wx3-only.

Still need to get VSTs updated.
This commit is contained in:
Leland Lucius
2015-07-13 16:38:24 -05:00
parent 4deccfc980
commit 2f760c4bac
38 changed files with 777 additions and 2586 deletions

View File

@@ -77,12 +77,6 @@
#include "../TimeTrack.h"
#include "../Dependencies.h"
// Callback to display format options
static void ExportCallback(void *cbdata, int index)
{
((Exporter *) cbdata)->DisplayOptions(index);
}
//----------------------------------------------------------------------------
// ExportPlugin
//----------------------------------------------------------------------------
@@ -236,7 +230,7 @@ bool ExportPlugin::DisplayOptions(wxWindow * WXUNUSED(parent), int WXUNUSED(form
return false;
}
wxWindow *ExportPlugin::OptionsCreate(wxWindow *parent, int format)
wxWindow *ExportPlugin::OptionsCreate(wxWindow *parent, int WXUNUSED(format))
{
wxPanel *p = new wxPanel(parent, wxID_ANY);
ShuttleGui S(p, eIsCreatingFromPrefs);
@@ -583,9 +577,11 @@ bool Exporter::GetFilename()
fd.SetUserPaneCreator(CreateUserPaneCallback, (wxUIntPtr) this);
fd.SetFilterIndex(mFilterIndex);
fd.EnableButton(_("&Options..."), ExportCallback, this);
int result = fd.ShowModal();
if (fd.ShowModal() == wxID_CANCEL) {
mDialog->PopEventHandler();
if (result == wxID_CANCEL) {
return false;
}