diff --git a/aegisub/audio_box.cpp b/aegisub/audio_box.cpp index f8587bc04b9d5879647387da7e1b13e1fda993af..32893eb822022a586f30799ecc1d607842267bc0 100644 --- a/aegisub/audio_box.cpp +++ b/aegisub/audio_box.cpp @@ -108,9 +108,9 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE // VertVol sider wxSizer *VertVol = new wxBoxSizer(wxHORIZONTAL); - wxSizer *VertVolArea = new wxBoxSizer(wxVERTICAL); VertVol->Add(VerticalZoom,1,wxEXPAND,0); VertVol->Add(VolumeBar,1,wxEXPAND,0); + wxSizer *VertVolArea = new wxBoxSizer(wxVERTICAL); VertVolArea->Add(VertVol,1,wxEXPAND,0); VertVolArea->Add(VerticalLink,0,wxEXPAND,0); diff --git a/aegisub/audio_display.cpp b/aegisub/audio_display.cpp index 7fd7e73f97871b496e4ff70f7ff1fb39f3a5f79e..f02abe4d172405e6df441dec507d16ac48829305 100644 --- a/aegisub/audio_display.cpp +++ b/aegisub/audio_display.cpp @@ -594,13 +594,13 @@ void AudioDisplay::DrawSpectrum(wxDC &finaldc,bool weak) { } if (!weak) { - unsigned char *img = (unsigned char *)malloc(h*w*3); // wxImage requires using malloc - if (!spectrumRenderer) spectrumRenderer = new AudioSpectrum(provider); spectrumRenderer->SetScaling(scale); + unsigned char *img = (unsigned char *)malloc(h*w*3); // wxImage requires using malloc + // Use a slightly slower, but simple way // Always draw the spectrum for the entire width // Hack: without those divs by 2 the display is horizontally compressed diff --git a/aegisub/audio_karaoke.cpp b/aegisub/audio_karaoke.cpp index 886c9026254b8a564791ec124880641911fb8bcc..1f76c13930997e832571761cf1ade408ae206852 100644 --- a/aegisub/audio_karaoke.cpp +++ b/aegisub/audio_karaoke.cpp @@ -363,12 +363,12 @@ void AudioKaraoke::OnPaint(wxPaintEvent &event) { if (syl.pending_splits.size() > 0) { wxArrayInt widths; if (dc.GetPartialTextExtents(temptext, widths)) { - for (unsigned int i = 0; i < syl.pending_splits.size(); i++) { + for (unsigned int j = 0; j < syl.pending_splits.size(); j++) { dc.SetPen(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); int splitxpos = dx + 4; // Handle splitters placed before first char in syllable; these are represented as -1 - if (syl.pending_splits[i] >= 0) { - splitxpos += widths[syl.pending_splits[i]]; + if (syl.pending_splits[j] >= 0) { + splitxpos += widths[syl.pending_splits[j]]; } else { splitxpos += 0; } diff --git a/aegisub/stdwx.cpp b/aegisub/stdwx.cpp index c404c8d9b513918b4902c7f9fe7d119fcbda4d15..bca28ddcf953c17f2e23f8c7841d8ac404ba787e 100644 --- a/aegisub/stdwx.cpp +++ b/aegisub/stdwx.cpp @@ -45,5 +45,4 @@ // MatroskaParser.c, as well as any possible future .c files. // - #include "stdwx.h" diff --git a/aegisub/stdwx.h b/aegisub/stdwx.h index 16b435d781f4e86a14fa2fcad9dc5dc9d3a1d4a4..dfc83cb9ccbfdb5974d4f833c6d6e0c4e74f9bf1 100644 --- a/aegisub/stdwx.h +++ b/aegisub/stdwx.h @@ -60,6 +60,7 @@ ///////////////////// // wxWidgets headers +#pragma warning(disable: 6011) #include <wx/wxprec.h> #include <wx/notebook.h> #include <wx/statline.h> @@ -91,6 +92,7 @@ #include <wx/glcanvas.h> + /////////////// // STD headers #include <vector>