1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-13 16:15:48 +01:00

Preliminary changes for wxWidgets 3.0.1

We can't go to 3.0.1 yet as there are still build issues on
Linux and OSX.  You can get Windows to build, but there's
still some display issues.

These changes should work with wxWidgets 2.8.12 as well, so
we can take our time to get things working properly before
switching over.
This commit is contained in:
lllucius
2014-10-06 08:10:50 +00:00
parent 0933da5b60
commit bdcefb4850
54 changed files with 252 additions and 220 deletions

View File

@@ -35,6 +35,7 @@
#include <wx/checkbox.h>
#include <wx/slider.h>
#include <wx/sizer.h>
#include <wx/textctrl.h>
// Used to communicate the type of the filter.
static const int bassType = 0; //Low Shelf

View File

@@ -14,6 +14,8 @@
class wxString;
#include <wx/defs.h>
#include <wx/dc.h>
#include <wx/dcclient.h>
#include <wx/bitmap.h>
#include <wx/button.h>
#include <wx/checkbox.h>

View File

@@ -496,7 +496,7 @@ void ContrastDialog::OnExport(wxCommandEvent & WXUNUSED(event))
wxString fName = wxT("contrast.txt");
fName = FileSelector(_("Export Contrast Result As:"),
NULL, fName, wxT("txt"), wxT("*.txt"), wxFD_SAVE | wxRESIZE_BORDER, this);
wxEmptyString, fName, wxT("txt"), wxT("*.txt"), wxFD_SAVE | wxRESIZE_BORDER, this);
if (fName == wxT(""))
return;

View File

@@ -3579,7 +3579,7 @@ void VSTEffect::SizeWindow(int w, int h)
wxCommandEvent sw(EVT_SIZEWINDOW);
sw.SetInt(w);
sw.SetExtraLong(h);
mDlg->AddPendingEvent(sw);
mDlg->GetEventHandler()->AddPendingEvent(sw);
}
return;
@@ -3590,7 +3590,7 @@ void VSTEffect::UpdateDisplay()
// Tell the dialog to refresh effect information
if (mDlg) {
wxCommandEvent ud(EVT_UPDATEDISPLAY);
mDlg->AddPendingEvent(ud);
mDlg->GetEventHandler()->AddPendingEvent(ud);
}
}

View File

@@ -716,7 +716,7 @@ bool EffectNyquist::Process()
// See also http://bugzilla.audacityteam.org/show_bug.cgi?id=642#c9
// for further info about this thread safety question.
wxString prevlocale = wxSetlocale(LC_NUMERIC, NULL);
wxSetlocale(LC_NUMERIC, wxT("C"));
wxSetlocale(LC_NUMERIC, wxString(wxT("C")));
nyx_init();
nyx_set_os_callback(StaticOSCallback, (void *)this);