Merging r6145 through r6171 from trunk to ogl-es branch

[irrlicht.git] / examples / Demo / CMainMenu.cpp

diff --git a/examples/Demo/CMainMenu.cpp b/examples/Demo/CMainMenu.cpp
index 432c87274b999e642c9c8582eb81b159f2622cd5..f67d9f3ca6f7d922de589eb66a66930596400e91 100644 (file)
--- a/examples/Demo/CMainMenu.cpp
+++ b/examples/Demo/CMainMenu.cpp
@@ -72,24 +72,14 @@ bool CMainMenu::run()
        // add list box\r
 \r
        gui::IGUIListBox* box = guienv->addListBox(core::rect<int>(10,10,220,120), optTab, 1);\r
-\r
-       const wchar_t* const names[] =\r
-               {L"Software Renderer", L"Burning's Video",\r
-               L"Direct3D 8", L"Direct3D 9", L"OpenGL 1.x-4.x",\r
-               L"OpenGL-ES 1.x", L"OpenGL-ES 2.x"};\r
        for (u32 i=1; i<video::EDT_COUNT; ++i)\r
        {\r
                if (IrrlichtDevice::isDriverSupported(video::E_DRIVER_TYPE(i)))\r
-                       box->addItem(names[i-1]);\r
-       }\r
-\r
-       switch (driverType )\r
-       {\r
-               case video::EDT_OPENGL:        selected = 0; break;\r
-               case video::EDT_DIRECT3D9:     selected = 1; break;\r
-               case video::EDT_BURNINGSVIDEO: selected = 2; break;\r
-               case video::EDT_SOFTWARE:      selected = 3; break;\r
-               default: break;\r
+               {\r
+                       box->addItem(core::stringw(video::DRIVER_TYPE_NAMES[i]).c_str());\r
+                       if ( driverType == video::E_DRIVER_TYPE(i) )\r
+                               selected = box->getItemCount()-1;\r
+               }\r
        }\r
        box->setSelected(selected);\r
 \r