aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorJohannes Schickel2010-06-15 19:20:58 +0000
committerJohannes Schickel2010-06-15 19:20:58 +0000
commit49463c2bf95f8293746f2b6cb9420f313c6babf3 (patch)
tree54a2678f2e3d5cb20ad7b070b961605d9a9dc2a3 /gui
parent7360bea1ee55443c14639c13bc0b548bb941a705 (diff)
downloadscummvm-rg350-49463c2bf95f8293746f2b6cb9420f313c6babf3.tar.gz
scummvm-rg350-49463c2bf95f8293746f2b6cb9420f313c6babf3.tar.bz2
scummvm-rg350-49463c2bf95f8293746f2b6cb9420f313c6babf3.zip
Use USE_TRANSLATION, USE_DETECTLANG and USE_TERMCONV instead of (ENABLE_)TRANSLATION, DETECTLANG and TERMCONV.
svn-id: r49885
Diffstat (limited to 'gui')
-rw-r--r--gui/options.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 792b99ba22..780670e78b 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -853,12 +853,12 @@ GlobalOptionsDialog::GlobalOptionsDialog()
// TODO: joystick setting
-#ifdef TRANSLATION
+#ifdef USE_TRANSLATION
_guiLanguagePopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.GuiLanguagePopupDesc", _("GUI Language:"), _("Language of ScummVM GUI"));
_guiLanguagePopUp = new PopUpWidget(tab, "GlobalOptions_Misc.GuiLanguagePopup");
-#ifdef DETECTLANG
+#ifdef USE_DETECTLANG
_guiLanguagePopUp->appendEntry(_("<default>"), Common::kTranslationAutodetectId);
-#endif // DETECTLANG
+#endif // USE_DETECTLANG
_guiLanguagePopUp->appendEntry(_("English"), Common::kTranslationBuiltinId);
_guiLanguagePopUp->appendEntry("", 0);
Common::TLangArray languages = TransMan.getSupportedLanguages();
@@ -869,7 +869,7 @@ GlobalOptionsDialog::GlobalOptionsDialog()
}
_guiLanguagePopUp->setSelectedTag(TransMan.parseLanguage(ConfMan.get("gui_language").c_str()));
-#endif // TRANSLATION
+#endif // USE_TRANSLATION
// Activate the first tab
tab->setActiveTab(0);
@@ -977,7 +977,7 @@ void GlobalOptionsDialog::close() {
g_gui.loadNewTheme(g_gui.theme()->getThemeId(), selected);
ConfMan.set("gui_renderer", cfg, _domain);
}
-#ifdef TRANSLATION
+#ifdef USE_TRANSLATION
Common::String oldLang = ConfMan.get("gui_language");
int selLang = _guiLanguagePopUp->getSelectedTag();
@@ -997,7 +997,7 @@ void GlobalOptionsDialog::close() {
error.runModal();
#endif
}
-#endif // TRANSLATION
+#endif // USE_TRANSLATION
}
OptionsDialog::close();