Author: axeld Date: 2011-05-25 19:10:27 +0200 (Wed, 25 May 2011) New Revision: 41745 Changeset: https://dev.haiku-os.org/changeset/41745 Modified: haiku/trunk/src/apps/readonlybootprompt/BootPromptWindow.cpp Log: * Reenabled flags via the new BLocaleRoster::GetFlagIconForLanguage() method. +alpha (also for the previous commit) Modified: haiku/trunk/src/apps/readonlybootprompt/BootPromptWindow.cpp =================================================================== --- haiku/trunk/src/apps/readonlybootprompt/BootPromptWindow.cpp 2011-05-25 17:09:30 UTC (rev 41744) +++ haiku/trunk/src/apps/readonlybootprompt/BootPromptWindow.cpp 2011-05-25 17:10:27 UTC (rev 41745) @@ -63,20 +63,14 @@ BStringItem(label), fLanguage(language) { -// Don't use *country* flags for *languages*. Can be re-enabled and adjusted -// accordingly once we have language icons. -#if 0 fIcon = new(std::nothrow) BBitmap(BRect(0, 0, 15, 15), B_RGBA32); if (fIcon != NULL && (!fIcon->IsValid() - || BLocaleRoster::Default()->GetFlagIconForCountry(fIcon, + || BLocaleRoster::Default()->GetFlagIconForLanguage(fIcon, language) != B_OK)) { delete fIcon; fIcon = NULL; } -#else - fIcon = NULL; -#endif } ~LanguageItem() @@ -313,7 +307,7 @@ // Try to instantiate a BCatalog for each language, it will only work // for translations of this application. So the list of languages will be - // limited to catalogs written for this application, which is on purpose! + // limited to catalogs written for this application, which is on purpose! const char* languageID; LanguageItem* currentItem = NULL;