diff options
author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2010-08-25 03:09:52 +0400 |
---|---|---|
committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2010-08-25 03:09:52 +0400 |
commit | 5ec52f06c26f6d1b8527f41ffb85f3249595c0a9 (patch) | |
tree | 52e6da799e22d1620ee5963dc23fe6bd455ff00d | |
parent | fbf44d908ab23e19d32f9fe78f6abd905d93e1aa (diff) |
2010-08-24 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* include/prsht.h (SNDMSG, POSTMSG): Define macros and use throughout.
Thank you to Ozkan Sezer for reporting the issue.
-rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
-rw-r--r-- | winsup/w32api/include/prsht.h | 52 |
2 files changed, 40 insertions, 18 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 54272aa47..988900081 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,11 @@ 2010-08-24 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> + * include/prsht.h (SNDMSG, POSTMSG): Define macros and use throughout. + + Thank you to Ozkan Sezer for reporting the issue. + +2010-08-24 Chris Sutcliffe <ir0nh34d@users.sourceforge.net> + * include/windowsx.h (SNDMSG): Define macro and use throughout. Thank you to Chris Oldwood for reporting the issue. diff --git a/winsup/w32api/include/prsht.h b/winsup/w32api/include/prsht.h index 299834b68..325435979 100644 --- a/winsup/w32api/include/prsht.h +++ b/winsup/w32api/include/prsht.h @@ -4,6 +4,22 @@ #pragma GCC system_header #endif +#ifndef SNDMSG +#ifdef __cplusplus +#define SNDMSG ::SNDMSG +#else +#define SNDMSG SNDMSG +#endif +#endif /* ifndef SNDMSG */ + +#ifndef POSTMSG +#ifdef __cplusplus +#define POSTMSG ::POSTMSG +#else +#define POSTMSG POSTMSG +#endif +#endif /* ifndef POSTMSG */ + #ifdef __cplusplus extern "C" { #endif @@ -253,24 +269,24 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW); BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE); int WINAPI PropertySheetA(LPCPROPSHEETHEADERA); int WINAPI PropertySheetW(LPCPROPSHEETHEADERW); -#define PropSheet_AddPage(d,p) SendMessage(d,PSM_ADDPAGE,0,(LPARAM)p) -#define PropSheet_Apply(d) SendMessage(d,PSM_APPLY,0,0) -#define PropSheet_CancelToClose(d) SendMessage(d,PSM_CANCELTOCLOSE,0,0) -#define PropSheet_Changed(d,w) SendMessage(d,PSM_CHANGED,(WPARAM)w,0) -#define PropSheet_GetCurrentPageHwnd(d) (HWND)SendMessage(d,PSM_GETCURRENTPAGEHWND,0,0) -#define PropSheet_GetTabControl(d) (HWND)SendMessage(d,PSM_GETTABCONTROL,0,0) -#define PropSheet_IsDialogMessage(d,m) (BOOL)SendMessage(d,PSM_ISDIALOGMESSAGE,0,(LPARAM)m) -#define PropSheet_PressButton(d,i) SendMessage(d,PSM_PRESSBUTTON,i,0) -#define PropSheet_QuerySiblings(d,w,l) SendMessage(d,PSM_QUERYSIBLINGS,w,l) -#define PropSheet_RebootSystem(d) SendMessage(d,PSM_REBOOTSYSTEM,0,0) -#define PropSheet_RemovePage(d,i,p) SendMessage(d,PSM_REMOVEPAGE,i,(LPARAM)p) -#define PropSheet_RestartWindows(d) SendMessage(d,PSM_RESTARTWINDOWS,0,0) -#define PropSheet_SetCurSel(d,p,i) SendMessage(d,PSM_SETCURSEL,i,(LPARAM)p) -#define PropSheet_SetCurSelByID(d,i) SendMessage(d,PSM_SETCURSELID,0,i) -#define PropSheet_SetFinishText(d,s) SendMessage(d,PSM_SETFINISHTEXT,0,(LPARAM)s) -#define PropSheet_SetTitle(d,w,s) SendMessage(d,PSM_SETTITLE,w,(LPARAM)s) -#define PropSheet_SetWizButtons(d,f) PostMessage(d,PSM_SETWIZBUTTONS,0,(LPARAM)f) -#define PropSheet_UnChanged(d,w) SendMessage(d,PSM_UNCHANGED,(WPARAM)w,0) +#define PropSheet_AddPage(d,p) SNDMSG(d,PSM_ADDPAGE,0,(LPARAM)p) +#define PropSheet_Apply(d) SNDMSG(d,PSM_APPLY,0,0) +#define PropSheet_CancelToClose(d) POSTMSG(d,PSM_CANCELTOCLOSE,0,0) +#define PropSheet_Changed(d,w) SNDMSG(d,PSM_CHANGED,(WPARAM)w,0) +#define PropSheet_GetCurrentPageHwnd(d) (HWND)SNDMSG(d,PSM_GETCURRENTPAGEHWND,0,0) +#define PropSheet_GetTabControl(d) (HWND)SNDMSG(d,PSM_GETTABCONTROL,0,0) +#define PropSheet_IsDialogMessage(d,m) (BOOL)SNDMSG(d,PSM_ISDIALOGMESSAGE,0,(LPARAM)m) +#define PropSheet_PressButton(d,i) POSTMSG(d,PSM_PRESSBUTTON,i,0) +#define PropSheet_QuerySiblings(d,w,l) SNDMSG(d,PSM_QUERYSIBLINGS,w,l) +#define PropSheet_RebootSystem(d) SNDMSG(d,PSM_REBOOTSYSTEM,0,0) +#define PropSheet_RemovePage(d,i,p) SNDMSG(d,PSM_REMOVEPAGE,i,(LPARAM)p) +#define PropSheet_RestartWindows(d) SNDMSG(d,PSM_RESTARTWINDOWS,0,0) +#define PropSheet_SetCurSel(d,p,i) SNDMSG(d,PSM_SETCURSEL,i,(LPARAM)p) +#define PropSheet_SetCurSelByID(d,i) SNDMSG(d,PSM_SETCURSELID,0,i) +#define PropSheet_SetFinishText(d,s) SNDMSG(d,PSM_SETFINISHTEXT,0,(LPARAM)s) +#define PropSheet_SetTitle(d,w,s) SNDMSG(d,PSM_SETTITLE,w,(LPARAM)s) +#define PropSheet_SetWizButtons(d,f) POSTMSG(d,PSM_SETWIZBUTTONS,0,(LPARAM)f) +#define PropSheet_UnChanged(d,w) SNDMSG(d,PSM_UNCHANGED,(WPARAM)w,0) #endif #ifdef UNICODE |