summaryrefslogtreecommitdiff
path: root/plugins/ExternalAPI
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-04-20 16:23:24 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-04-20 16:23:24 +0000
commit856f604fd0cffa212b06cabfb7a5324c8e4d5460 (patch)
treeac8f3e6b754eea052d267a79ab9506ac79df0649 /plugins/ExternalAPI
parentf725c70b482df377119e2c09b36c9317f86ef494 (diff)
name conflict resolution
git-svn-id: http://svn.miranda-ng.org/main/trunk@4485 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/ExternalAPI')
-rw-r--r--plugins/ExternalAPI/m_userinfoex.h8
1 files changed, 4 insertions, 4 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