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.

src/export/Export.cpp

@@ -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;
       }
 

src/export/ExportPCM.cpp

@@ -97,6 +97,7 @@ class ExportPCMOptions : public wxPanel
 public:
 
    ExportPCMOptions(wxWindow *parent, int format);
+   virtual ~ExportPCMOptions();
    void PopulateOrExchange(ShuttleGui & S);
    void OnHeaderChoice(wxCommandEvent & evt);
 
@@ -164,6 +165,11 @@ ExportPCMOptions::ExportPCMOptions(wxWindow *parent, int selformat)
    PopulateOrExchange(S);
 }
 
+ExportPCMOptions::~ExportPCMOptions()
+{
+   WriteExportFormatPref(GetFormat());
+}
+
 void ExportPCMOptions::PopulateOrExchange(ShuttleGui & S)
 {
    S.StartVerticalLay();