amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility check - export is still a reserved word.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@431 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2007-06-24 15:32:15 +00:00
parent f0628317a3
commit 4bf2d44ebe
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/native_look_editor.cpp
+3 -3
View File
@@ -213,8 +213,8 @@ ExportOptionsEditor::ExportOptionsEditor(Window* parent, int id, long style)
: NativeLookEditor(parent, id, style)
{}
void ExportOptionsEditor::showExport(const ExportTemplateP& export) {
setStyles(set->stylesheet, export->option_style);
setData(settings.exportOptionsFor(*export));
void ExportOptionsEditor::showExport(const ExportTemplateP& export_template) {
setStyles(set->stylesheet, export_template->option_style);
setData(settings.exportOptionsFor(*export_template));
}
src/gui/control/native_look_editor.hpp
+1 -1
View File
@@ -85,7 +85,7 @@ class ExportOptionsEditor : public NativeLookEditor {
ExportOptionsEditor(Window* parent, int id, long style = 0);
/// Show the options for given export template
void showExport(const ExportTemplateP& export);
void showExport(const ExportTemplateP& export_template);
};
// ----------------------------------------------------------------------------- : EOF
src/gui/html_export_window.cpp
+3 -3
View File
@@ -62,10 +62,10 @@ void HtmlExportWindow::onOk(wxCommandEvent&) {
void HtmlExportWindow::onTemplateSelect(wxCommandEvent&) {
wxBusyCursor wait;
ExportTemplateP export = list->getSelection<ExportTemplate>();
ExportTemplateP export_template = list->getSelection<ExportTemplate>();
handle_pending_errors();
options->showExport(export);
settings.gameSettingsFor(*set->game).default_export = export->name();
options->showExport(export_template);
settings.gameSettingsFor(*set->game).default_export = export_template->name();
UpdateWindowUI(wxUPDATE_UI_RECURSE);
}