From 547ec570deb26f93fa4ab974a76c0e964a635586 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Mon, 15 Jun 2015 13:22:04 +0000 Subject: MirLua: - added ansi/unicode support for some fields - added default value for GetContactSetting git-svn-id: http://svn.miranda-ng.org/main/trunk@14175 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirLua/src/m_msg_buttonsbar.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'plugins/MirLua/src/m_msg_buttonsbar.cpp') diff --git a/plugins/MirLua/src/m_msg_buttonsbar.cpp b/plugins/MirLua/src/m_msg_buttonsbar.cpp index bdaabf2a94..a9b1f6756f 100644 --- a/plugins/MirLua/src/m_msg_buttonsbar.cpp +++ b/plugins/MirLua/src/m_msg_buttonsbar.cpp @@ -18,12 +18,15 @@ static BBButton* MakeBBButton(lua_State *L) lua_pushstring(L, "Flags"); lua_gettable(L, -2); - tbb->bbbFlags = BBBF_ISLSIDEBUTTON | lua_tointeger(L, -1); + tbb->bbbFlags = lua_tointeger(L, -1); lua_pop(L, 1); lua_pushstring(L, "Tooltip"); lua_gettable(L, -2); - tbb->ptszTooltip = mir_utf8decodeT((char*)lua_tostring(L, -1)); + if ((tbb->bbbFlags & BBBF_ANSITOOLTIP)) + tbb->pszTooltip = mir_utf8decode((char*)lua_tostring(L, -1), NULL); + else + tbb->ptszTooltip = mir_utf8decodeT((char*)lua_tostring(L, -1)); lua_pop(L, 1); lua_pushstring(L, "Icon"); -- cgit v1.2.3