diff -r 7c68ddce6561 datafiles/layouts/TabPage1.layout
--- a/datafiles/layouts/TabPage1.layout Wed Sep 05 14:32:16 2012 +0200
+++ b/datafiles/layouts/TabPage1.layout Sun Sep 16 06:35:07 2012 +0300
@@ -21,7 +21,7 @@
             <Property name="TooltipText" value="Switch active page to selected" />
         </Window>

-        <Window name="PageList" type="TaharezLook/Listbox">
+        <Window name="PageList" type="TaharezLook/ItemListbox">
             <Property name="Area" value="{{0.55,0},{0.1,0},{0.95,0},{0.48,0}}" />
             <Property name="TooltipText" value="A list of available tabs to experiment with" />
         </Window>
diff -r 7c68ddce6561 samples/TabControlDemo/Sample_TabControl.cpp
--- a/samples/TabControlDemo/Sample_TabControl.cpp  Wed Sep 05 14:32:16 2012 +0200
+++ b/samples/TabControlDemo/Sample_TabControl.cpp  Sun Sep 16 06:35:07 2012 +0300
@@ -178,12 +178,12 @@
     {
         Window* root = System::getSingleton().getDefaultGUIContext().getRootWindow();
         // Check if the windows exists
-        Listbox* lbox = 0;
+        ItemListbox* lbox = 0;
         TabControl* tc = 0;

         if (root->isChild("Frame/TabControl/Page1/PageList"))
         {
-            lbox = static_cast<Listbox*>(root->getChild(
+            lbox = static_cast<ItemListbox*>(root->getChild(
                                              "Frame/TabControl/Page1/PageList"));
         }

@@ -199,8 +199,10 @@

             for (size_t i = 0; i < tc->getTabCount(); i++)
             {
-                lbox->addItem(new MyListItem(
-                                  tc->getTabContentsAtIndex(i)->getName()));
+                ItemEntry* item = static_cast<ItemEntry*>(
+                                      WindowManager::getSingleton().createWindow("TaharezLook/ListboxItem"));
+                item->setText(tc->getTabContentsAtIndex(i)->getName());
+                lbox->addItem(item);
             }
         }
     }