From 856f604fd0cffa212b06cabfb7a5324c8e4d5460 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 20 Apr 2013 16:23:24 +0000
Subject: name conflict resolution

git-svn-id: http://svn.miranda-ng.org/main/trunk@4485 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SendScreenshotPlus/src/global.h | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'plugins/SendScreenshotPlus/src/global.h')

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")
-
-- 
cgit v1.2.3