name conflict resolution

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

4 files changed, 9 insertions, 38 deletions

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")

-