Merging r6383 through r6403 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6404 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-15 16:02:08 +00:00
parent ec38b153da
commit ddc14ea87e
57 changed files with 337 additions and 282 deletions
--- a/source/Irrlicht/CGUIListBox.cpp
+++ b/source/Irrlicht/CGUIListBox.cpp
@@ -97,13 +97,6 @@ s32 CGUIListBox::getIcon(u32 id) const
 }


-//! adds a list item, returns id of item
-u32 CGUIListBox::addItem(const wchar_t* text)
-{
-	return addItem(text, -1);
-}
-
-
 //! adds a list item, returns id of item
 void CGUIListBox::removeItem(u32 id)
 {