summaryrefslogtreecommitdiff
path: root/plugins/MirLua/src/m_msg_buttonsbar.cpp
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2015-06-15 13:22:04 +0000
committerAlexander Lantsev <aunsane@gmail.com>2015-06-15 13:22:04 +0000
commit547ec570deb26f93fa4ab974a76c0e964a635586 (patch)
tree1faf753295780f76f841c80b57106ec508b86133 /plugins/MirLua/src/m_msg_buttonsbar.cpp
parent779e5910d73c0b14454bcbce6206f77e139c8df8 (diff)
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
Diffstat (limited to 'plugins/MirLua/src/m_msg_buttonsbar.cpp')
-rw-r--r--plugins/MirLua/src/m_msg_buttonsbar.cpp7
1 files changed, 5 insertions, 2 deletions
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");