mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Updated a few GCC issues, and case-sensitivity of filenames.
I had to rename the export function in Apprentice.cpp since "export" is a reserved word according to the C++ standard. I don't know whether GCC supports it yet, but it certainly complains. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@302 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -608,7 +608,7 @@ class ApprenticeExportWindow : public wxDialog, public WithProgress {
|
||||
void onOk(wxCommandEvent& ev);
|
||||
|
||||
/// Export the set
|
||||
bool export();
|
||||
bool exportSet();
|
||||
};
|
||||
|
||||
|
||||
@@ -689,7 +689,7 @@ void ApprenticeExportWindow::onOk(wxCommandEvent& ev) {
|
||||
progress_target->Show();
|
||||
// export!
|
||||
try {
|
||||
if (!export()) {
|
||||
if (!exportSet()) {
|
||||
// canceled, but allow to try again
|
||||
progress_target->Hide();
|
||||
progress_target->Close();
|
||||
@@ -706,7 +706,7 @@ void ApprenticeExportWindow::onOk(wxCommandEvent& ev) {
|
||||
EndModal(wxID_OK);
|
||||
}
|
||||
|
||||
bool ApprenticeExportWindow::export() {
|
||||
bool ApprenticeExportWindow::exportSet() {
|
||||
// Expan database
|
||||
doStep(_("Exporting expansion"), 0.01f);
|
||||
ApprExpansionDatabase expan(this);
|
||||
|
||||
Reference in New Issue
Block a user