Merge default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-10-30 01:07:39 -03:00
13 changed files with 144 additions and 15 deletions
+7
View File
@@ -466,6 +466,12 @@ int w_maximize(lua_State *)
return 0;
}
int w_isMaximized(lua_State *L)
{
luax_pushboolean(L, instance()->isMaximized());
return 0;
}
int w_showMessageBox(lua_State *L)
{
Window::MessageBoxData data = {};
@@ -567,6 +573,7 @@ static const luaL_Reg functions[] =
{ "fromPixels", w_fromPixels },
{ "minimize", w_minimize },
{ "maximize", w_maximize },
{ "isMaximized", w_isMaximized },
{ "showMessageBox", w_showMessageBox },
{ "requestAttention", w_requestAttention },
{ 0, 0 }