diff options
Diffstat (limited to 'community/aegisub/aegisub-wx-stl.patch')
| -rw-r--r-- | community/aegisub/aegisub-wx-stl.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/community/aegisub/aegisub-wx-stl.patch b/community/aegisub/aegisub-wx-stl.patch new file mode 100644 index 000000000..d174d8308 --- /dev/null +++ b/community/aegisub/aegisub-wx-stl.patch @@ -0,0 +1,61 @@ +From f71b380f016c7f2b7ec855a9945a4e62ad3e2e16 Mon Sep 17 00:00:00 2001 +From: Thomas Goyne <plorkyeran@aegisub.org> +Date: Sun, 5 Jan 2014 08:10:08 -0800 +Subject: [PATCH 1/4] Fix compilation with wx built with --enable-stl + +--enable-stl replaces the implicit conversion to char/wchar_t* with one +to std::[w]string. This breaks conversions to boost::filesytem::path and +makes some ternaries ambiguous (which GCC helpfully reports as no +conversion existing rather than an ambiguous conversion). +--- + aegisub/src/base_grid.cpp | 6 +++--- + aegisub/src/command/video.cpp | 2 +- + aegisub/src/dialog_attachments.cpp | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp +index 9422bf9..4675ad5 100644 +--- a/aegisub/src/base_grid.cpp ++++ b/aegisub/src/base_grid.cpp +@@ -570,9 +570,9 @@ void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wx + if (paint_columns[4]) strings[4] = to_wx(line->Style); + if (paint_columns[5]) strings[5] = to_wx(line->Actor); + if (paint_columns[6]) strings[6] = to_wx(line->Effect); +- if (paint_columns[7]) strings[7] = line->Margin[0] ? std::to_wstring(line->Margin[0]) : wxString(); +- if (paint_columns[8]) strings[8] = line->Margin[1] ? std::to_wstring(line->Margin[1]) : wxString(); +- if (paint_columns[9]) strings[9] = line->Margin[2] ? std::to_wstring(line->Margin[2]) : wxString(); ++ if (paint_columns[7]) strings[7] = line->Margin[0] ? wxString(std::to_wstring(line->Margin[0])) : wxString(); ++ if (paint_columns[8]) strings[8] = line->Margin[1] ? wxString(std::to_wstring(line->Margin[1])) : wxString(); ++ if (paint_columns[9]) strings[9] = line->Margin[2] ? wxString(std::to_wstring(line->Margin[2])) : wxString(); + + if (paint_columns[10]) { + strings[10].clear(); +diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp +index 010da90..47bf259 100644 +--- a/aegisub/src/command/video.cpp ++++ b/aegisub/src/command/video.cpp +@@ -476,7 +476,7 @@ static void save_snapshot(agi::Context *c, bool raw) { + // If where ever that is isn't defined, we can't save there + if ((basepath == "\\") || (basepath == "/")) { + // So save to the current user's home dir instead +- basepath = wxGetHomeDir(); ++ basepath = wxGetHomeDir().c_str(); + } + } + // Actual fixed (possibly relative) path, decode it +diff --git a/aegisub/src/dialog_attachments.cpp b/aegisub/src/dialog_attachments.cpp +index 5465b39..2ff696e 100644 +--- a/aegisub/src/dialog_attachments.cpp ++++ b/aegisub/src/dialog_attachments.cpp +@@ -150,7 +150,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) { + + // Multiple or single? + if (listView->GetNextSelected(i) != -1) +- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())); ++ path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str(); + else { + path = SaveFileSelector( + _("Select the path to save the file to:"), +-- +1.8.5.2 + |