name conflict resolution

git-svn-id: http://svn.miranda-ng.org/main/trunk@4485 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 24 insertions, 53 deletions

diff --git a/plugins/ExternalAPI/m_userinfoex.h b/plugins/ExternalAPI/m_userinfoex.h
index 2bcd7ec9e2..76be0cd8d3 100644
--- a/plugins/ExternalAPI/m_userinfoex.h
+++ b/plugins/ExternalAPI/m_userinfoex.h
@@ -251,14 +251,14 @@ lParam = not used
 // button styles

 #define MBS_DEFBUTTON		0x00001000L			// default button

 #define MBS_PUSHBUTTON		0x00002000L			// toggle button

-#define MBS_FLAT			0x00004000L			// flat button

+#define MBS_FLAT           0x00004000L			// flat button

 #define MBS_DOWNARROW		0x00008000L			// has arrow on the right

 

-#define MBF_UNICODE			1

+#define MBBF_UNICODE			1

 #ifdef _UNICODE

- #define MBF_TCHAR			MBF_UNICODE

+ #define MBBF_TCHAR			MBBF_UNICODE

 #else

- #define MBF_TCHAR			0

+ #define MBBF_TCHAR			0

 #endif

 

 // BUTTONADDTOOLTIP

diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.cpp b/plugins/SendScreenshotPlus/src/UAboutForm.cpp
index d24a395575..0b112a3803 100644
--- a/plugins/SendScreenshotPlus/src/UAboutForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UAboutForm.cpp
@@ -185,7 +185,7 @@ void TfrmAbout::btnPageClick() {
 	if(!m_Page) {

 		ShowWindow(GetDlgItem(m_hWnd, IDC_CREDIT), SW_HIDE);

 		ShowWindow(GetDlgItem(m_hWnd, IDC_LICENSE), SW_SHOW);

-		SendDlgItemMessage(m_hWnd, IDA_CONTRIBLINK, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Credits >"), MBF_TCHAR);

+		SendDlgItemMessage(m_hWnd, IDA_CONTRIBLINK, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Credits >"), MBBF_TCHAR);

 		HICON hIcon = IcoLib_GetIcon(ICO_PLUG_ARROWR);

 		SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

 		SetWindowText(hCtrl, hIcon ? TranslateT("Credits") : TranslateT("Credits >"));

@@ -193,7 +193,7 @@ void TfrmAbout::btnPageClick() {
 	else {

 		ShowWindow(GetDlgItem(m_hWnd, IDC_CREDIT), SW_SHOW);

 		ShowWindow(GetDlgItem(m_hWnd, IDC_LICENSE), SW_HIDE);

-		SendDlgItemMessage(m_hWnd, IDA_CONTRIBLINK, BUTTONADDTOOLTIP, (WPARAM)TranslateT("< Copyright"), MBF_TCHAR);

+		SendDlgItemMessage(m_hWnd, IDA_CONTRIBLINK, BUTTONADDTOOLTIP, (WPARAM)TranslateT("< Copyright"), MBBF_TCHAR);

 		HICON hIcon = IcoLib_GetIcon(ICO_PLUG_ARROWL);

 		SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

 		SetWindowText(hCtrl, hIcon ? TranslateT("Copyright") : TranslateT("< Copyright"));

diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 95311e984d..9285b5f9d7 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -321,21 +321,21 @@ LRESULT TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) {
 	CheckDlgButton(m_hWnd,ID_chkOpenAgain, m_opt_chkOpenAgain ? BST_CHECKED : BST_UNCHECKED);

 

 	if (hCtrl = GetDlgItem(m_hWnd, ID_btnAbout)) {

-		SendDlgItemMessage(m_hWnd, ID_btnAbout, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Information"), MBF_TCHAR);

+		SendDlgItemMessage(m_hWnd, ID_btnAbout, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Information"), MBBF_TCHAR);

 		HICON hIcon = IcoLib_GetIcon(ICO_PLUG_SSHELP);

 		SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

 		SetWindowText(hCtrl, hIcon ? _T("") : _T("?"));

 	}

 

 	if (hCtrl = GetDlgItem(m_hWnd, ID_btnExplore)) {

-		SendDlgItemMessage(m_hWnd, ID_btnExplore, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open Folder"), MBF_TCHAR);

+		SendDlgItemMessage(m_hWnd, ID_btnExplore, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open Folder"), MBBF_TCHAR);

 		HICON hIcon = IcoLib_GetIcon(ICO_PLUG_SSFOLDERO);

 		SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

 		SetWindowText(hCtrl, hIcon ? _T("") : _T("..."));

 	}

 

 	if (hCtrl = GetDlgItem(m_hWnd, ID_btnDesc)) {

-		SendDlgItemMessage(m_hWnd, ID_btnDesc, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Fill description textbox."), MBF_TCHAR);

+		SendDlgItemMessage(m_hWnd, ID_btnDesc, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Fill description textbox."), MBBF_TCHAR);

 		HICON hIcon = IcoLib_GetIcon(m_opt_btnDesc ? ICO_PLUG_SSDESKON : ICO_PLUG_SSDESKOFF);

 		SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

 		SetWindowText(hCtrl, hIcon ? _T("") : _T("D"));

@@ -343,7 +343,7 @@ LRESULT TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) {
 	}

 

 	if (hCtrl = GetDlgItem(m_hWnd, ID_btnDeleteAfterSend)) {

-		SendDlgItemMessage(m_hWnd, ID_btnDeleteAfterSend, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Delete after send"), MBF_TCHAR);

+		SendDlgItemMessage(m_hWnd, ID_btnDeleteAfterSend, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Delete after send"), MBBF_TCHAR);

 		HICON hIcon = IcoLib_GetIcon(m_opt_btnDeleteAfterSend ? ICO_PLUG_SSDELON : ICO_PLUG_SSDELOFF);

 		SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

 		SetWindowText(hCtrl, hIcon ? _T("") : _T("X"));

@@ -351,7 +351,7 @@ LRESULT TfrmMain::wmInitdialog(WPARAM wParam, LPARAM lParam) {
 	}

 

 	if (hCtrl = GetDlgItem(m_hWnd, ID_btnCapture)) {

-		SendDlgItemMessage(m_hWnd, ID_btnCapture, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Capture"), MBF_TCHAR);

+		SendDlgItemMessage(m_hWnd, ID_btnCapture, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Capture"), MBBF_TCHAR);

 		HICON hIcon = IcoLib_GetIcon(ICO_PLUG_OK);

 		SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

 		SetWindowText(hCtrl, TranslateT("&Capture"));

diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.cpp b/plugins/SendScreenshotPlus/src/ctrl_button.cpp
index 6bc116dfe1..7a3b2b5380 100644
--- a/plugins/SendScreenshotPlus/src/ctrl_button.cpp
+++ b/plugins/SendScreenshotPlus/src/ctrl_button.cpp
@@ -565,7 +565,7 @@ static LRESULT CALLBACK Button_WndProc(HWND hwndBtn, UINT uMsg, WPARAM wParam, L
 				hwndToolTips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

 			}

 

-			if (lParam == MBF_UNICODE) {

+			if (lParam == MBBF_UNICODE) {

 				TOOLINFOW ti;

 

 				ZeroMemory(&ti, sizeof(TOOLINFOW));

diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h
index 2cf2a12374..c10e8c56f5 100644
--- a/plugins/SendScreenshotPlus/src/global.h
+++ b/plugins/SendScreenshotPlus/src/global.h
@@ -71,6 +71,7 @@ using namespace std;
 #include <m_ftpfile.h>

 #include <m_popup2.h>

 #include <m_sendss.h>

+#include <m_userinfoex.h>

 

 #include "mir_string.h"

 #include "mir_icolib.h"

@@ -141,33 +142,3 @@ std::basic_string<_Elem> replace(const std::basic_string<_Elem> & Origninal, con
 }

 

 #endif

-

-/*************************************************************

- *	Uinfobuttonclass module

- */

- 

-// button styles

-#define MBS_DEFBUTTON		0x00001000L			// default button

-#define MBS_PUSHBUTTON		0x00002000L			// toggle button

-#define MBS_FLAT			0x00004000L			// flat button

-#define MBS_DOWNARROW		0x00008000L			// has arrow on the right

-

-#define MBF_UNICODE			1

-

-#define MBF_TCHAR			MBF_UNICODE

-

-

-// BUTTONADDTOOLTIP

-// use lParam=MBF_UNICODE to set unicode tooltips

-// for lParam=0 the string is interpreted as ansi

-

-// message to explicitly translate the buttons text,

-// as it is not done by default translation routine

-// wParam=lParam=NULL

-#define BUTTONTRANSLATE		(WM_USER+6)

-

-/* UserInfo/MsgBox v0.1.0.4+

-Slightly modified version of MButtonClass, to draw both text and icon in a button control

-*/

-#define UINFOBUTTONCLASS	_T("UInfoButtonClass")

-

diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index 68f603547c..9554d9f182 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
@@ -48,8 +48,8 @@ CAnnivEditCtrl::CAnnivEditCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
 	_numDates = 0;

 	

 	// set button tooltips

-	SendMessage(_hBtnAdd, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Add a new anniversary"), MBF_TCHAR);

-	SendMessage(_hBtnDel, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Delete an existing anniversary"), MBF_TCHAR);

+	SendMessage(_hBtnAdd, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Add a new anniversary"), MBBF_TCHAR);

+	SendMessage(_hBtnDel, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Delete an existing anniversary"), MBBF_TCHAR);

 

 	// limit textinput

 	SendDlgItemMessage(_hwndDlg, EDIT_REMIND, EM_LIMITTEXT, 2, 0);

diff --git a/plugins/UserInfoEx/src/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp
index 5a1d648a6d..fd29e29f4c 100644
--- a/plugins/UserInfoEx/src/ctrl_button.cpp
+++ b/plugins/UserInfoEx/src/ctrl_button.cpp
@@ -565,7 +565,7 @@ static LRESULT CALLBACK Button_WndProc(HWND hwndBtn, UINT uMsg, WPARAM wParam, L
 				hwndToolTips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

 			}

 

-			if (lParam == MBF_UNICODE) {

+			if (lParam == MBBF_UNICODE) {

 				TOOLINFOW ti;

 

 				ZeroMemory(&ti, sizeof(TOOLINFOW));

diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index 72b6d977e4..33ee274585 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -546,10 +546,10 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 			SendMessage(cbex->hEdit, WM_SETFONT, (WPARAM)cbex->hFont, NULL);

 			SendMessage(cbex->hEdit, EM_LIMITTEXT, (WPARAM)MAXDATASIZE, NULL);

 			// add tooltips

-			SendMessage(cbex->hBtnMenu, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Choose the item to display."), MBF_TCHAR);

-			SendMessage(cbex->hBtnEdit, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Edit the currently displayed item."), MBF_TCHAR);

-			SendMessage(cbex->hBtnAdd, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Add a new custom item."), MBF_TCHAR);

-			SendMessage(cbex->hBtnDel, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Delete the selected item."), MBF_TCHAR);

+			SendMessage(cbex->hBtnMenu, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Choose the item to display."), MBBF_TCHAR);

+			SendMessage(cbex->hBtnEdit, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Edit the currently displayed item."), MBBF_TCHAR);

+			SendMessage(cbex->hBtnAdd, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Add a new custom item."), MBBF_TCHAR);

+			SendMessage(cbex->hBtnDel, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Delete the selected item."), MBBF_TCHAR);

 			// reload icons

 			CtrlContactWndProc(hwnd, WM_SETICON, NULL, NULL);

 			cbex->bLocked = 0;

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 0510e79b48..e495a1482d 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -785,8 +785,8 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 				SendDlgItemMessage(hDlg, IDOK, BUTTONTRANSLATE, NULL, NULL);

 				SendDlgItemMessage(hDlg, IDCANCEL, BUTTONTRANSLATE, NULL, NULL);

 				SendDlgItemMessage(hDlg, IDAPPLY, BUTTONTRANSLATE, NULL, NULL);

-				SendDlgItemMessage(hDlg, BTN_EXPORT, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Export to file"), MBF_TCHAR);

-				SendDlgItemMessage(hDlg, BTN_IMPORT, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Import from file"), MBF_TCHAR);

+				SendDlgItemMessage(hDlg, BTN_EXPORT, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Export to file"), MBBF_TCHAR);

+				SendDlgItemMessage(hDlg, BTN_IMPORT, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Import from file"), MBBF_TCHAR);

 			}

 

 			//

diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp
index b5ac2dab8c..9254fd392f 100644
--- a/plugins/UserInfoEx/src/psp_contact.cpp
+++ b/plugins/UserInfoEx/src/psp_contact.cpp
@@ -51,7 +51,7 @@ INT_PTR CALLBACK PSPProcContactHome(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 

 				mir_sntprintf(szAddr, MAX_PATH, _T("%s (%s)"), TranslateT("Address"), TranslateT("Home"));

 				SetDlgItemText(hDlg, IDC_PAGETITLE, szAddr);

-				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in Browser"), MBF_TCHAR);

+				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in Browser"), MBBF_TCHAR);

 				TranslateDialogDefault(hDlg);

 

 				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STREET,					SET_CONTACT_STREET,			DBVT_TCHAR));

@@ -208,7 +208,7 @@ INT_PTR CALLBACK PSPProcContactWork(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 

 				mir_sntprintf(szAddr, MAX_PATH, _T("%s (%s)"), TranslateT("Address & Contact"), TranslateT("Company"));

 				SetDlgItemText(hDlg, IDC_PAGETITLE, szAddr);

-				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in Browser"), MBF_TCHAR);

+				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in Browser"), MBBF_TCHAR);

 				TranslateDialogDefault(hDlg);

 

 				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STREET,					SET_CONTACT_COMPANY_STREET,		DBVT_TCHAR));