From 215d426b429c2175274318636ffea28f8eccf86c Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Wed, 4 Jan 2012 09:29:59 -0200
Subject: [PATCH] restore clearText binding, don't display menu if its empty

---
 modules/core_widgets/uipopupmenu.lua | 6 ++++++
 src/framework/luafunctions.cpp       | 1 +
 2 files changed, 7 insertions(+)

diff --git a/modules/core_widgets/uipopupmenu.lua b/modules/core_widgets/uipopupmenu.lua
index 5ac6d15b..f3543ad2 100644
--- a/modules/core_widgets/uipopupmenu.lua
+++ b/modules/core_widgets/uipopupmenu.lua
@@ -9,6 +9,12 @@ function UIPopupMenu.create()
 end
 
 function UIPopupMenu:display(pos)
+  -- don't display if not options was added
+  if self:getChildCount() == 0 then
+    self:destroy()
+    return
+  end
+
   displayUI(self, {x = pos.x, y = pos.y})
   self:bindRectToParent()
   self:grabMouse()
diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp
index edd9110c..6dda9f67 100644
--- a/src/framework/luafunctions.cpp
+++ b/src/framework/luafunctions.cpp
@@ -85,6 +85,7 @@ void Application::registerLuaFunctions()
     g_lua.bindClassMemberFunction<UIWidget>("ungrabMouse", &UIWidget::ungrabMouse);
     g_lua.bindClassMemberFunction<UIWidget>("grabKeyboard", &UIWidget::grabKeyboard);
     g_lua.bindClassMemberFunction<UIWidget>("ungrabKeyboard", &UIWidget::ungrabKeyboard);
+    g_lua.bindClassMemberFunction<UIWidget>("clearText", &UIWidget::clearText);
     g_lua.bindClassMemberFunction<UIWidget>("isActive", &UIWidget::isActive);
     g_lua.bindClassMemberFunction<UIWidget>("isEnabled", &UIWidget::isEnabled);
     g_lua.bindClassMemberFunction<UIWidget>("isDisabled", &UIWidget::isDisabled);