BBBF_ANSITOOLTIP - unused flag removed

17 files changed, 75 insertions, 106 deletions

diff --git a/plugins/Actman/ua/i_uaplaces.inc b/plugins/Actman/ua/i_uaplaces.inc
index e103793ab2..f01c800066 100644
--- a/plugins/Actman/ua/i_uaplaces.inc
+++ b/plugins/Actman/ua/i_uaplaces.inc
@@ -63,7 +63,7 @@ begin
     tabb.bbbFlags:=BBSF_RELEASED;

   end;

   if pc=nil then pc:=ActionItem.szActDescr;

-  tabb.szTooltip.w:=pc;

+  tabb.szTooltip:=pc;

   CallService(MS_BB_SETBUTTONSTATE,hContact,TLPARAM(@tabb));

 end;

 

@@ -745,9 +745,9 @@ begin
                      BBBF_ISCHATBUTTON;

 

     if ActionItem.szTabBTooltip<>nil then

-      tabb.szTooltip.w:=ActionItem.szTabBTooltip

+      tabb.szTooltip:=ActionItem.szTabBTooltip

     else

-      tabb.szTooltip.w:=ActionItem.szActDescr;

+      tabb.szTooltip:=ActionItem.szActDescr;

 

     if CallService(MS_BB_ADDBUTTON,0,LPARAM(@tabb))=0 then

       ActionItem.flags:=ActionItem.flags or UAF_TBREGGED;

diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index 2bb50f1e03..5d7921af84 100644
--- a/plugins/BossKeyPlus/src/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
@@ -590,7 +590,7 @@ static int TabsrmmButtonsInit(WPARAM, LPARAM)
 	bbd.cbSize = sizeof(BBButton);

 	bbd.pszModuleName = MOD_NAME;

 	bbd.dwDefPos = 5000;

-	bbd.ptszTooltip = LPGENW("Hide Miranda NG");

+	bbd.pwszTooltip = LPGENW("Hide Miranda NG");

 	bbd.bbbFlags = BBBF_ISRSIDEBUTTON | BBBF_CANBEHIDDEN;

 	bbd.hIcon = iconList[0].hIcolib;

 	CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);

diff --git a/plugins/Dropbox/src/dropbox_events.cpp b/plugins/Dropbox/src/dropbox_events.cpp
index a6454efe64..61a5b7203b 100644
--- a/plugins/Dropbox/src/dropbox_events.cpp
+++ b/plugins/Dropbox/src/dropbox_events.cpp
@@ -26,7 +26,7 @@ int CDropbox::OnModulesLoaded(WPARAM, LPARAM)
 		bbd.pszModuleName = MODULE;

 

 		bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON;

-		bbd.ptszTooltip = TranslateT("Upload files to Dropbox");

+		bbd.pwszTooltip = TranslateT("Upload files to Dropbox");

 		bbd.hIcon = GetIconHandleByName("upload");

 		bbd.dwButtonID = BBB_ID_FILE_SEND;

 		bbd.dwDefPos = 100 + bbd.dwButtonID;

diff --git a/plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc b/plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc
index ee97f3d3ce..e93e5cb5bd 100644
--- a/plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc
+++ b/plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc
@@ -96,15 +96,13 @@ const
   BBBF_ISRSIDEBUTTON = $0080;

   BBBF_CANBEHIDDEN   = $0100;

   BBBF_ISDUMMYBUTTON = $0200;

-  BBBF_ANSITOOLTIP   = $0400;

-  BBBF_CREATEBYID    = $0800; //only for tabsrmm internal use

 

 type

   tagBBButton = record

     cbSize       :int;   // size of structure

     dwButtonID   :dword; // your button ID, will be combined with pszModuleName for storing settings, etc...  

     pszModuleName:PAnsiChar; // module name without spaces and underline symbols (e.g. "tabsrmm")

-    szTooltip    :TChar; // button's tooltip

+    szTooltip    :PWideChar; // button's tooltip

     dwDefPos     :dword; // default order pos of button, counted from window edge (left or right)

                          // use value >100, because internal buttons using 10,20,30... 80, etc

     iButtonWidth :int;   // must be 0

diff --git a/plugins/ExternalAPI/m_msg_buttonsbar.h b/plugins/ExternalAPI/m_msg_buttonsbar.h
index 73d4619229..c005b46a2f 100644
--- a/plugins/ExternalAPI/m_msg_buttonsbar.h
+++ b/plugins/ExternalAPI/m_msg_buttonsbar.h
@@ -99,26 +99,22 @@ typedef struct {
 #define BBBF_ISRSIDEBUTTON		(1<<7)

 #define BBBF_CANBEHIDDEN		(1<<8)

 #define BBBF_ISDUMMYBUTTON		(1<<9)

-#define BBBF_ANSITOOLTIP		(1<<10)

 

 #define BBBF_CREATEBYID			(1<<11)  //only for tabsrmm internal use

 

 typedef struct _tagBBButton

 {

-	int cbSize;           // size of structure

-

-	DWORD dwButtonID;     // your button ID, will be combined with pszModuleName for storing settings, etc...

-

-	char* pszModuleName;  //module name without spaces and underline symbols (e.g. "tabsrmm")

-	union{

-		char* pszTooltip;  //button's tooltip

-		TCHAR* ptszTooltip;

-	};

-	DWORD dwDefPos;       // default order pos of button, counted from window edge (left or right)

-	                      // use value >100, because internal buttons using 10,20,30... 80, etc

-	int iButtonWidth;		 // must be 0

-	DWORD bbbFlags;       // combine of BBBF_ flags above

-	HANDLE hIcon;         // Handle to icolib registered icon, it's better to register with pszSection = "TabSRMM/Toolbar"

+	int      cbSize;         // size of structure

+

+	DWORD    dwButtonID;     // your button ID, will be combined with pszModuleName for storing settings, etc...

+

+	char    *pszModuleName;  // module name without spaces and underline symbols (e.g. "tabsrmm")

+	wchar_t *pwszTooltip;

+	DWORD    dwDefPos;       // default order pos of button, counted from window edge (left or right)

+	                         // use value >100, because internal buttons using 10,20,30... 80, etc

+	int      iButtonWidth;   // must be 0

+	DWORD    bbbFlags;       // combine of BBBF_ flags above

+	HANDLE   hIcon;          // Handle to icolib registered icon, it's better to register with pszSection = "TabSRMM/Toolbar"

 }

 	BBButton;

 

diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp
index 588e7be378..569414b49b 100644
--- a/plugins/FTPFileYM/src/ftpfile.cpp
+++ b/plugins/FTPFileYM/src/ftpfile.cpp
@@ -189,7 +189,7 @@ void InitTabsrmmButton()
 		btn.dwDefPos = 105;

 		btn.hIcon = iconList[ServerList::FTP_COUNT].hIcolib;

 		btn.bbbFlags = BBBF_ISARROWBUTTON | BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN;

-		btn.ptszTooltip = TranslateT("FTP File");

+		btn.pwszTooltip = TranslateT("FTP File");

 		CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&btn);

 		HookEvent(ME_MSG_BUTTONPRESSED, TabsrmmButtonPressed);

 	}

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 1e58c25064..fb1f8e8560 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -900,7 +900,7 @@ static int TabsrmmButtonsInit(WPARAM, LPARAM)
 	bbd.pszModuleName = MODULENAME;

 	bbd.dwButtonID = 0;

 	bbd.dwDefPos = 1000;

-	bbd.ptszTooltip = LPGENW("Browse Received Files");

+	bbd.pwszTooltip = LPGENW("Browse Received Files");

 	bbd.bbbFlags = BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN;

 	bbd.hIcon = IcoLib_GetIconHandle("miex_recfiles");

 	CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);

diff --git a/plugins/MirLua/Modules/m_msg_buttonsbar/src/main.cpp b/plugins/MirLua/Modules/m_msg_buttonsbar/src/main.cpp
index f8f7ce7b7f..81da1b92a9 100644
--- a/plugins/MirLua/Modules/m_msg_buttonsbar/src/main.cpp
+++ b/plugins/MirLua/Modules/m_msg_buttonsbar/src/main.cpp
@@ -18,11 +18,8 @@ static BBButton* MakeBBButton(lua_State *L)
 	bbb->bbbFlags = lua_tointeger(L, -1);

 	lua_pop(L, 1);

 

-	if ((bbb->bbbFlags & BBBF_ANSITOOLTIP))

-		bbb->bbbFlags &= ~BBBF_ANSITOOLTIP;

-

 	lua_getfield(L, -1, "Tooltip");

-	bbb->ptszTooltip = mir_utf8decodeW(lua_tostring(L, -1));

+	bbb->pwszTooltip = mir_utf8decodeW(lua_tostring(L, -1));

 	lua_pop(L, 1);

 

 	lua_getfield(L, -1, "Icon");

@@ -62,7 +59,7 @@ static int lua_ModifyButton(lua_State *L)
 	lua_pushinteger(L, res);

 

 	mir_free(bbb->pszModuleName);

-	mir_free(bbb->ptszTooltip);

+	mir_free(bbb->pwszTooltip);

 	mir_free(bbb);

 

 	return 1;

diff --git a/plugins/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/src/svcs_srmm.cpp
index 025b968610..485f7b73bb 100644
--- a/plugins/MirOTR/src/svcs_srmm.cpp
+++ b/plugins/MirOTR/src/svcs_srmm.cpp
@@ -40,22 +40,22 @@ void SetEncryptionStatus(MCONTACT hContact, TrustLevel level)
 		switch (level) {
 		case TRUST_FINISHED:
 			sid.flags = 0;
-			button.ptszTooltip = TranslateW(LANG_STATUS_FINISHED);
+			button.pwszTooltip = TranslateW(LANG_STATUS_FINISHED);
 			button.hIcon = IcoLib_GetIconHandle(ICON_FINISHED);
 			break;
 		case TRUST_UNVERIFIED:
 			sid2.flags = MBF_DISABLED;
-			button.ptszTooltip = TranslateW(LANG_STATUS_UNVERIFIED);
+			button.pwszTooltip = TranslateW(LANG_STATUS_UNVERIFIED);
 			button.hIcon = IcoLib_GetIconHandle(ICON_UNVERIFIED);
 			break;
 		case TRUST_PRIVATE:
 			sid2.flags = 0;
-			button.ptszTooltip = TranslateW(LANG_STATUS_PRIVATE);
+			button.pwszTooltip = TranslateW(LANG_STATUS_PRIVATE);
 			button.hIcon = IcoLib_GetIconHandle(ICON_PRIVATE);
 			break;
 		default:
 			sid.flags = MBF_DISABLED;
-			button.ptszTooltip = TranslateW(LANG_STATUS_DISABLED);
+			button.pwszTooltip = TranslateW(LANG_STATUS_DISABLED);
 			button.hIcon = IcoLib_GetIconHandle(ICON_NOT_PRIVATE);
 			break;
 		}
@@ -140,7 +140,7 @@ void InitSRMM()
 		OTRButton.pszModuleName = MODULENAME;
 		OTRButton.dwDefPos = 200;
 		OTRButton.bbbFlags = BBBF_ISRSIDEBUTTON|BBBF_CANBEHIDDEN|BBBF_ISIMBUTTON;
-		OTRButton.ptszTooltip = TranslateT(LANG_OTR_TOOLTIP);
+		OTRButton.pwszTooltip = TranslateT(LANG_OTR_TOOLTIP);
 		OTRButton.hIcon = IcoLib_GetIconHandle(ICON_NOT_PRIVATE);
 		HookEvent(ME_MSG_TOOLBARLOADED, SVC_ButtonsBarLoaded);
 		HookEvent(ME_MSG_BUTTONPRESSED, SVC_ButtonsBarPressed);
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp
index 79b8a2f80c..2ca21f19b0 100644
--- a/plugins/Nudge/src/main.cpp
+++ b/plugins/Nudge/src/main.cpp
@@ -250,7 +250,7 @@ static int TabsrmmButtonInit(WPARAM, LPARAM)
 {

 	BBButton bbd = { sizeof(bbd) };

 	bbd.pszModuleName = "Nudge";

-	bbd.ptszTooltip = LPGENW("Send Nudge");

+	bbd.pwszTooltip = LPGENW("Send Nudge");

 	bbd.dwDefPos = 300;

 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN;

 	bbd.hIcon = iconList[0].hIcolib;

diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp
index c5e08928b4..9ba068870b 100644
--- a/plugins/PasteIt/src/PasteIt.cpp
+++ b/plugins/PasteIt/src/PasteIt.cpp
@@ -345,7 +345,7 @@ void InitTabsrmmButton()
 		btn.dwDefPos = 110;

 		btn.hIcon = icon.hIcolib;

 		btn.bbbFlags = BBBF_ISARROWBUTTON | BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN | BBBF_ISCHATBUTTON;

-		btn.ptszTooltip = TranslateT("Paste It");

+		btn.pwszTooltip = TranslateT("Paste It");

 		CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&btn);

 

 		if (hTabsrmmButtonPressed != NULL)

diff --git a/plugins/QuickMessages/src/Utils.cpp b/plugins/QuickMessages/src/Utils.cpp
index 3b79669ca8..d1d481d4df 100644
--- a/plugins/QuickMessages/src/Utils.cpp
+++ b/plugins/QuickMessages/src/Utils.cpp
@@ -381,7 +381,7 @@ int RegisterCustomButton(WPARAM, LPARAM)
 		bbd.dwDefPos = 320 + i;
 		bbd.hIcon = AddIcon(iconname);
 		bbd.pszModuleName = PLGNAME;
-		bbd.ptszTooltip = ld->ptszButtonName;
+		bbd.pwszTooltip = ld->ptszButtonName;
 		CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);
 	}
 	return 0;
diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp
index 94d3e7035e..944727dcbb 100644
--- a/plugins/QuickMessages/src/options.cpp
+++ b/plugins/QuickMessages/src/options.cpp
@@ -257,7 +257,7 @@ void SaveMenuTree()
 			bb.cbSize = sizeof(BBButton);

 			bb.pszModuleName = PLGNAME;

 			bb.dwButtonID = iBl;

-			bb.ptszTooltip = ld->ptszButtonName;

+			bb.pwszTooltip = ld->ptszButtonName;

 			CallService(MS_BB_MODIFYBUTTON, 0, (LPARAM)&bb);

 		}

 

diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp
index b84d89eed9..fb26bef2a6 100644
--- a/plugins/QuickReplies/src/events.cpp
+++ b/plugins/QuickReplies/src/events.cpp
@@ -59,7 +59,7 @@ int OnModulesLoaded(WPARAM, LPARAM)
 		bbd.cbSize = sizeof(BBButton);

 		bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON;

 		bbd.pszModuleName = buttonName;

-		bbd.ptszTooltip = LPGENW("Quick Replies\r\nLeft button - open menu\r\nRight button - options page");

+		bbd.pwszTooltip = LPGENW("Quick Replies\r\nLeft button - open menu\r\nRight button - options page");

 		bbd.hIcon = icon.hIcolib;

 		bbd.dwButtonID = iNumber;

 		bbd.dwDefPos = 220;

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 15feb901b0..a87bca2694 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -9,22 +9,19 @@
 struct CustomButtonData : public MZeroedObject
 {
 	~CustomButtonData()
-	{
-		mir_free(m_pszModuleName);
-		mir_free(m_ptszTooltip);
-	}
+	{}
 
 	void Accustom(HWND hwnd, TWindowData *dat);
 
 	DWORD  m_dwPosition;    // default order pos of button, counted from window edge (left or right)
 
 	DWORD  m_dwButtonOrigID; // id of button used while button creation and to store button info in DB
-	char  *m_pszModuleName;  // module name without spaces and underline symbols (e.g. "tabsrmm")
+	ptrA   m_pszModuleName;  // module name without spaces and underline symbols (e.g. "tabsrmm")
 
 	DWORD  m_dwButtonCID;
 	DWORD  m_dwArrowCID;    // only use with BBBF_ISARROWBUTTON flag
 
-	wchar_t *m_ptszTooltip;   // button's tooltip
+	ptrW   m_pwszTooltip;   // button's tooltip
 
 	int    m_iButtonWidth;  // must be 22 for regular button and 33 for button with arrow
 	HANDLE m_hIcon;         // Handle to icolib registred icon
@@ -116,14 +113,7 @@ static INT_PTR CB_AddButton(WPARAM, LPARAM lParam)
 		cbd->m_iButtonWidth = DPISCALEX_S(bbdi->iButtonWidth);
 
 	cbd->m_pszModuleName = mir_strdup(bbdi->pszModuleName);
-
-	if (bbdi->ptszTooltip) {
-		if (bbdi->bbbFlags & BBBF_ANSITOOLTIP)
-			cbd->m_ptszTooltip = mir_a2u(bbdi->pszTooltip);
-		else
-			cbd->m_ptszTooltip = mir_wstrdup(bbdi->ptszTooltip);
-	}
-	else cbd->m_ptszTooltip = NULL;
+	cbd->m_pwszTooltip = mir_wstrdup(bbdi->pwszTooltip);
 
 	cbd->m_dwButtonOrigID = bbdi->dwButtonID;
 	cbd->m_hIcon = bbdi->hIcon;
@@ -232,8 +222,8 @@ static INT_PTR CB_SetButtonState(WPARAM wParam, LPARAM lParam)
 	SetDlgItemTextA(hwndDlg, tempCID, bbdi->pszModuleName);
 	if (bbdi->hIcon)
 		SendDlgItemMessage(hwndDlg, tempCID, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(bbdi->hIcon));
-	if (bbdi->pszTooltip)
-		SendDlgItemMessage(hwndDlg, tempCID, BUTTONADDTOOLTIP, (WPARAM)bbdi->ptszTooltip, (bbdi->bbbFlags & BBBF_ANSITOOLTIP) ? 0 : BATF_UNICODE);
+	if (bbdi->pwszTooltip)
+		SendDlgItemMessage(hwndDlg, tempCID, BUTTONADDTOOLTIP, (WPARAM)bbdi->pwszTooltip, BATF_UNICODE);
 	if (bbdi->bbbFlags) {
 		Utils::showDlgControl(hwndDlg, tempCID, (bbdi->bbbFlags & BBSF_HIDDEN) ? SW_HIDE : SW_SHOW);
 		Utils::enableDlgControl(hwndDlg, tempCID, !(bbdi->bbbFlags & BBSF_DISABLED));
@@ -309,13 +299,8 @@ static INT_PTR CB_ModifyButton(WPARAM, LPARAM lParam)
 		}
 
 		if (bFound) {
-			if (bbdi->pszTooltip) {
-				mir_free(cbd->m_ptszTooltip);
-				if (bbdi->bbbFlags & BBBF_ANSITOOLTIP)
-					cbd->m_ptszTooltip = mir_a2u(bbdi->pszTooltip);
-				else
-					cbd->m_ptszTooltip = mir_wstrdup(bbdi->ptszTooltip);
-			}
+			if (bbdi->pwszTooltip)
+				cbd->m_pwszTooltip = mir_wstrdup(bbdi->pwszTooltip);
 			if (bbdi->hIcon)
 				cbd->m_hIcon = bbdi->hIcon;
 			if (bbdi->bbbFlags) {
@@ -463,7 +448,7 @@ static int BuildMenuObjectsTree(HWND hToolBarTree)
 			tvis.item.iImage = tvis.item.iSelectedImage = 0;
 		}
 		else {
-			tvis.item.pszText = TranslateW(cbd->m_ptszTooltip);
+			tvis.item.pszText = TranslateW(cbd->m_pwszTooltip);
 			iImage = ImageList_AddIcon(himgl, IcoLib_GetIconByHandle(cbd->m_hIcon));
 			tvis.item.iImage = tvis.item.iSelectedImage = iImage;
 		}
@@ -491,7 +476,7 @@ static int BuildMenuObjectsTree(HWND hToolBarTree)
 			tvis.item.iImage = tvis.item.iSelectedImage = -1;
 		}
 		else {
-			tvis.item.pszText = TranslateW(cbd->m_ptszTooltip);
+			tvis.item.pszText = TranslateW(cbd->m_pwszTooltip);
 			iImage = ImageList_AddIcon(himgl, IcoLib_GetIconByHandle(cbd->m_hIcon));
 			tvis.item.iImage = tvis.item.iSelectedImage = iImage;
 		}
@@ -802,8 +787,8 @@ void CustomButtonData::Accustom(HWND hwndBtn, TWindowData *dat)
 	SendMessage(hwndBtn, BUTTONSETASTHEMEDBTN, CSkin::IsThemed(), 0);
 	if (m_hIcon)
 		SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(m_hIcon));
-	if (m_ptszTooltip)
-		SendMessage(hwndBtn, BUTTONADDTOOLTIP, (WPARAM)TranslateW(m_ptszTooltip), BATF_UNICODE);
+	if (m_pwszTooltip)
+		SendMessage(hwndBtn, BUTTONADDTOOLTIP, (WPARAM)TranslateW(m_pwszTooltip), BATF_UNICODE);
 	SendMessage(hwndBtn, BUTTONSETCONTAINER, (LPARAM)dat->pContainer, 0);
 	SendMessage(hwndBtn, BUTTONSETASTOOLBARBUTTON, TRUE, 0);
 
@@ -840,14 +825,14 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 10;
 	bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_CONNECTING);
 	bbd.pszModuleName = "Tabsrmm";
-	bbd.ptszTooltip = LPGENW("Protocol button");
+	bbd.pwszTooltip = LPGENW("Protocol button");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISARROWBUTTON | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_NAME;
 	bbd.dwDefPos = 20;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[20];
-	bbd.ptszTooltip = LPGENW("Info button");
+	bbd.pwszTooltip = LPGENW("Info button");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	if (PluginConfig.g_SmileyAddAvail) {
@@ -856,7 +841,7 @@ void CB_InitDefaultButtons()
 		bbd.iButtonWidth = 0;
 		bbd.dwDefPos = 30;
 		bbd.hIcon = PluginConfig.g_buttonBarIconHandles[9];
-		bbd.ptszTooltip = LPGENW("Insert emoticon");
+		bbd.pwszTooltip = LPGENW("Insert emoticon");
 		CB_AddButton(0, (LPARAM)&bbd);
 	}
 
@@ -864,28 +849,28 @@ void CB_InitDefaultButtons()
 	bbd.dwButtonID = IDC_FONTBOLD;
 	bbd.dwDefPos = 40;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[10];
-	bbd.ptszTooltip = LPGENW("Bold text");
+	bbd.pwszTooltip = LPGENW("Bold text");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_FONTITALIC;
 	bbd.dwDefPos = 50;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[11];
-	bbd.ptszTooltip = LPGENW("Italic text");
+	bbd.pwszTooltip = LPGENW("Italic text");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_FONTUNDERLINE;
 	bbd.dwDefPos = 60;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[12];
-	bbd.ptszTooltip = LPGENW("Underlined text");
+	bbd.pwszTooltip = LPGENW("Underlined text");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDC_FONTSTRIKEOUT;
 	bbd.dwDefPos = 70;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[15];
-	bbd.ptszTooltip = LPGENW("Strike-through text");
+	bbd.pwszTooltip = LPGENW("Strike-through text");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_ISARROWBUTTON | BBBF_CREATEBYID;
@@ -893,7 +878,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 10;
 	bbd.iButtonWidth = 51;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[6];
-	bbd.ptszTooltip = LPGENW("Send message\nClick dropdown arrow for sending options");
+	bbd.pwszTooltip = LPGENW("Send message\nClick dropdown arrow for sending options");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
@@ -901,7 +886,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 20;
 	bbd.iButtonWidth = 0;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[8];
-	bbd.ptszTooltip = LPGENW("Close session");
+	bbd.pwszTooltip = LPGENW("Close session");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
@@ -909,7 +894,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 30;
 	bbd.iButtonWidth = 0;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[4];
-	bbd.ptszTooltip = LPGENW("Quote last message OR selected text");
+	bbd.pwszTooltip = LPGENW("Quote last message OR selected text");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
@@ -917,7 +902,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 40;
 	bbd.iButtonWidth = 0;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[2];
-	bbd.ptszTooltip = LPGENW("Message log options");
+	bbd.pwszTooltip = LPGENW("Message log options");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
@@ -925,7 +910,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 50;
 	bbd.iButtonWidth = 0;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[0];
-	bbd.ptszTooltip = LPGENW("View user's history");
+	bbd.pwszTooltip = LPGENW("View user's history");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
@@ -933,34 +918,27 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 60;
 	bbd.iButtonWidth = 0;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[7];
-	bbd.ptszTooltip = LPGENW("Edit user notes");
+	bbd.pwszTooltip = LPGENW("Edit user notes");
 	CB_AddButton(0, (LPARAM)&bbd);
 
-	//chat buttons
-
+	// chat buttons
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISDUMMYBUTTON;
 	bbd.dwButtonID = 1;
 	bbd.pszModuleName = "tb_splitter";
 	bbd.dwDefPos = 31;
 	bbd.iButtonWidth = 22;
 	bbd.hIcon = 0;
-	bbd.pszTooltip = 0;
+	bbd.pwszTooltip = 0;
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISDUMMYBUTTON;
 	bbd.dwButtonID = 2;
 	bbd.dwDefPos = 22;
-	bbd.iButtonWidth = 22;
-	bbd.hIcon = 0;
-	bbd.pszTooltip = 0;
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISDUMMYBUTTON;
 	bbd.dwButtonID = 3;
 	bbd.dwDefPos = 71;
-	bbd.iButtonWidth = 22;
-	bbd.hIcon = 0;
-	bbd.pszTooltip = 0;
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID;
@@ -968,7 +946,7 @@ void CB_InitDefaultButtons()
 	bbd.pszModuleName = "Tabsrmm";
 	bbd.dwDefPos = 80;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[14];
-	bbd.ptszTooltip = LPGENW("Select font color");
+	bbd.pwszTooltip = LPGENW("Select font color");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID;
@@ -976,7 +954,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 81;
 	bbd.iButtonWidth = 22;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[16];
-	bbd.ptszTooltip = LPGENW("Change background color");
+	bbd.pwszTooltip = LPGENW("Change background color");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
@@ -984,7 +962,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 22;
 	bbd.iButtonWidth = 22;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[19];
-	bbd.ptszTooltip = LPGENW("Toggle nick list");
+	bbd.pwszTooltip = LPGENW("Toggle nick list");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
@@ -992,7 +970,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 24;
 	bbd.iButtonWidth = 22;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[18];
-	bbd.ptszTooltip = LPGENW("Event filter - right click to setup, left click to activate/deactivate");
+	bbd.pwszTooltip = LPGENW("Event filter - right click to setup, left click to activate/deactivate");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_CREATEBYID;
@@ -1000,7 +978,7 @@ void CB_InitDefaultButtons()
 	bbd.dwDefPos = 33;
 	bbd.iButtonWidth = 22;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[17];
-	bbd.ptszTooltip = LPGENW("Channel manager");
+	bbd.pwszTooltip = LPGENW("Channel manager");
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	BB_RegisterSeparators();
@@ -1402,8 +1380,8 @@ void CB_ChangeButton(HWND hwndDlg, TWindowData *dat, CustomButtonData *cbd)
 
 	if (cbd->m_hIcon)
 		SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIconByHandle(cbd->m_hIcon));
-	if (cbd->m_ptszTooltip)
-		SendMessage(hwndBtn, BUTTONADDTOOLTIP, (WPARAM)cbd->m_ptszTooltip, BATF_UNICODE);
+	if (cbd->m_pwszTooltip)
+		SendMessage(hwndBtn, BUTTONADDTOOLTIP, (WPARAM)cbd->m_pwszTooltip, BATF_UNICODE);
 	SendMessage(hwndBtn, BUTTONSETCONTAINER, (LPARAM)dat->pContainer, 0);
 	SetWindowTextA(hwndBtn, cbd->m_pszModuleName);
 }
diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp
index 120906e8e0..4acddabb73 100644
--- a/plugins/TabSRMM/src/modplus.cpp
+++ b/plugins/TabSRMM/src/modplus.cpp
@@ -59,7 +59,7 @@ static int RegisterCustomButton(WPARAM, LPARAM)
 	bbd.dwDefPos = 200;

 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[3];

 	bbd.pszModuleName = "Tabmodplus";

-	bbd.ptszTooltip = LPGENW("Insert [img] tag / surround selected text with [img][/img]");

+	bbd.pwszTooltip = LPGENW("Insert [img] tag / surround selected text with [img][/img]");

 	return CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);

 }

 

@@ -130,7 +130,7 @@ static int CustomButtonPressed(WPARAM wParam, LPARAM lParam)
 		pszFormatedText = (wchar_t*)_alloca(bufSize*sizeof(wchar_t));

 		mir_snwprintf(pszFormatedText, bufSize, L"[img]%s[/img]", pszText);

 

-		bbd.ptszTooltip = 0;

+		bbd.pwszTooltip = 0;

 		bbd.hIcon = 0;

 		bbd.bbbFlags = BBSF_RELEASED;

 		CallService(MS_BB_SETBUTTONSTATE, wParam, (LPARAM)&bbd);

@@ -139,14 +139,14 @@ static int CustomButtonPressed(WPARAM wParam, LPARAM lParam)
 	case 3:

 		pszFormatedText = L"[img]";

 

-		bbd.ptszTooltip = LPGENW("Insert [img] tag / surround selected text with [img][/img]");

+		bbd.pwszTooltip = LPGENW("Insert [img] tag / surround selected text with [img][/img]");

 		CallService(MS_BB_SETBUTTONSTATE, wParam, (LPARAM)&bbd);

 		break;

 

 	case 4:

 		pszFormatedText = L"[/img]";

 

-		bbd.ptszTooltip = LPGENW("Insert [img] tag / surround selected text with [img][/img]");

+		bbd.pwszTooltip = LPGENW("Insert [img] tag / surround selected text with [img][/img]");

 		CallService(MS_BB_SETBUTTONSTATE, wParam, (LPARAM)&bbd);

 		break;

 	}

diff --git a/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp b/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp
index 196ea89d6a..497e429a3d 100644
--- a/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp
+++ b/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp
@@ -87,21 +87,21 @@ int OnModulesLoaded(WPARAM, LPARAM)
 		bbd.cbSize = sizeof(BBButton);

 		bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON;

 		bbd.pszModuleName = "Switch Layout and Send";

-		bbd.ptszTooltip = TranslateT("Switch Layout and Send");

+		bbd.pwszTooltip = TranslateT("Switch Layout and Send");

 		bbd.hIcon = iconList[0].hIcolib;

 		bbd.dwButtonID = 1;

 		bbd.dwDefPos = 30;

 		CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);

 

 		bbd.pszModuleName = "Translit and Send";

-		bbd.ptszTooltip = TranslateT("Translit and Send");

+		bbd.pwszTooltip = TranslateT("Translit and Send");

 		bbd.hIcon = iconList[1].hIcolib;

 		bbd.dwButtonID = 1;

 		bbd.dwDefPos = 40;

 		CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);

 

 		bbd.pszModuleName = "Invert Case and Send";

-		bbd.ptszTooltip = TranslateT("Invert Case and Send");

+		bbd.pwszTooltip = TranslateT("Invert Case and Send");

 		bbd.hIcon = iconList[2].hIcolib;

 		bbd.dwButtonID = 1;

 		bbd.dwDefPos = 50;

@@ -117,21 +117,21 @@ int OnPreShutdown(WPARAM, LPARAM)
 		bbd.cbSize = sizeof(BBButton);

 		bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON;

 		bbd.pszModuleName = "Switch Layout and Send";

-		bbd.ptszTooltip = TranslateT("Switch Layout and Send");

+		bbd.pwszTooltip = TranslateT("Switch Layout and Send");

 		bbd.hIcon = iconList[0].hIcolib;

 		bbd.dwButtonID = 1;

 		bbd.dwDefPos = 30;

 		CallService(MS_BB_REMOVEBUTTON, 0, (LPARAM)&bbd);

 

 		bbd.pszModuleName = "Translit and Send";

-		bbd.ptszTooltip = TranslateT("Translit and Send");

+		bbd.pwszTooltip = TranslateT("Translit and Send");

 		bbd.hIcon = iconList[1].hIcolib;

 		bbd.dwButtonID = 1;

 		bbd.dwDefPos = 40;

 		CallService(MS_BB_REMOVEBUTTON, 0, (LPARAM)&bbd);

 

 		bbd.pszModuleName = "Invert Case and Send";

-		bbd.ptszTooltip = TranslateT("Invert Case and Send");

+		bbd.pwszTooltip = TranslateT("Invert Case and Send");

 		bbd.hIcon = iconList[2].hIcolib;

 		bbd.dwButtonID = 1;

 		bbd.dwDefPos = 50;