summaryrefslogtreecommitdiff
path: root/include/m_popup.h
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-09-03 18:25:42 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-09-03 18:25:42 +0300
commitc0274fa5abfcfb59a4c8ae4d113d705ea0272c4c (patch)
treed8eda62b1e94d67f84a121295a3cb8f68b01849e /include/m_popup.h
parent4db67c1a255bf379e63641eff1f3527ea6aa2759 (diff)
popup code cleaning
Diffstat (limited to 'include/m_popup.h')
-rw-r--r--include/m_popup.h23
1 files changed, 7 insertions, 16 deletions
diff --git a/include/m_popup.h b/include/m_popup.h
index 509a6f20f4..4318ebb08d 100644
--- a/include/m_popup.h
+++ b/include/m_popup.h
@@ -631,15 +631,14 @@ returns: 0 = popup allowed, 1 = popup filtered out
//------------- Class API ----------------//
-typedef struct {
+#define PCF_UNICODE 0x0001
+
+struct POPUPCLASS
+{
int cbSize;
- int flags;
+ int flags; // PCF_* constants
char *pszName;
- union {
- char *pszDescription;
- wchar_t *pwszDescription;
- wchar_t *ptszDescription;
- };
+ MAllStrings pszDescription;
HICON hIcon;
@@ -650,15 +649,7 @@ typedef struct {
int iSeconds;
LPARAM lParam; //APF_RETURN_HWND, APF_CUSTOM_POPUP ... as above
-} POPUPCLASS;
-
-#define PCF_UNICODE 0x0001
-
-#ifdef _UNICODE
-#define PCF_TCHAR PCF_UNICODE
-#else
-#define PCF_TCHAR 0
-#endif
+};
// wParam = 0
// lParam = (POPUPCLASS *)&pc