From 49463c2bf95f8293746f2b6cb9420f313c6babf3 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 15 Jun 2010 19:20:58 +0000
Subject: Use USE_TRANSLATION, USE_DETECTLANG and USE_TERMCONV instead of
 (ENABLE_)TRANSLATION, DETECTLANG and TERMCONV.

svn-id: r49885
---
 gui/options.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gui/options.cpp')

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();
-- 
cgit v1.2.3