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:
coppro
2007-04-25 00:16:29 +00:00
parent e1c067a9a1
commit 7c40df0624
19 changed files with 61 additions and 43 deletions
+1 -1
View File
@@ -127,7 +127,7 @@ FakeTextValue::FakeTextValue(const TextFieldP& field, String* underlying, bool e
void FakeTextValue::store() {
if (underlying) {
if (editable) {
*underlying = untagged ? untag(value) : value;
*underlying = untagged ? untag(value) : value();
} else {
retrieve();
}
+3 -3
View File
@@ -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);