From 1d5d59eb24a5740ee42f20cef1ea4a1f8b257989 Mon Sep 17 00:00:00 2001 From: anders_k Date: Wed, 7 Nov 2018 02:36:21 +0000 Subject: [PATCH] Old MinGW somehow has the TRIVERTEX struct unprotected but GRADIENT_FILL_* behind WINVER >= 0x0500 and GradientFill behind WINVER >= 0x0410 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7045 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Makensisw/makensisw.h | 6 ------ Contrib/Makensisw/utils.cpp | 8 +++++++- Contrib/Makensisw/utils.h | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h index 97e9630c..dfd01726 100644 --- a/Contrib/Makensisw/makensisw.h +++ b/Contrib/Makensisw/makensisw.h @@ -247,10 +247,4 @@ typedef struct ToolTipStruct { HHOOK hook; } NTOOLTIP; -static void EnableUICommand(UINT Id, INT_PTR Enabled) -{ - EnableToolBarButton(Id, !!Enabled); - EnableMenuItem(g_sdata.menu, Id, Enabled ? MF_ENABLED : MF_GRAYED); -} - #endif diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp index 4ff3b1a4..2271b6db 100644 --- a/Contrib/Makensisw/utils.cpp +++ b/Contrib/Makensisw/utils.cpp @@ -36,7 +36,7 @@ WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND hwnd, DWORD dwFlags); #if !defined(_WIN32_WINNT) || _WIN32_WINNT-0 < 0x0410 typedef USHORT COLOR16; typedef struct _TRIVERTEX { LONG x, y; COLOR16 Red, Green, Blue, Alpha; } TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX; -WINGDIAPI BOOL WINAPI GradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG); +WINGDIAPI BOOL WINAPI GradientFill(HDC,TRIVERTEX*,ULONG,PVOID,ULONG,ULONG); #endif #endif @@ -1132,3 +1132,9 @@ bool RicheditHasSelection(HWND hRE) SendMessage(hRE, EM_EXGETSEL, 0, (LPARAM) &tr); return tr.cpMax - tr.cpMin <= 0 ? FALSE : TRUE; } + +void EnableUICommand(UINT Id, INT_PTR Enabled) +{ + EnableToolBarButton(Id, !!Enabled); + EnableMenuItem(g_sdata.menu, Id, Enabled ? MF_ENABLED : MF_GRAYED); +} \ No newline at end of file diff --git a/Contrib/Makensisw/utils.h b/Contrib/Makensisw/utils.h index b90372a1..b7449a69 100644 --- a/Contrib/Makensisw/utils.h +++ b/Contrib/Makensisw/utils.h @@ -119,4 +119,6 @@ static inline void GetGripperPos(HWND hwnd, RECT&r) bool RicheditHasSelection(HWND hRE); +void EnableUICommand(UINT Id, INT_PTR Enabled); + #endif