X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8c72298ec07a4f296ffde211360682447b9d159..af01f1ba0d697c07173f436ab661b4c833258a91:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 3e6653c834..e83f34baa6 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -25,6 +25,24 @@ // elsewhere because the functions, unlike the macros, respect the scope. // ---------------------------------------------------------------------------- +// CreateDialog + +#ifdef CreateDialog + #undef CreateDialog + + inline HWND CreateDialog(HINSTANCE hInstance, + LPCTSTR pTemplate, + HWND hwndParent, + DLGPROC pDlgProc) + { + #ifdef _UNICODE + return CreateDialogW(hInstance, pTemplate, hwndParent, pDlgProc); + #else + return CreateDialogA(hInstance, pTemplate, hwndParent, pDlgProc); + #endif + } +#endif + // GetCharWidth #ifdef GetCharWidth @@ -56,6 +74,23 @@ #endif #endif +// PlaySound + +#ifdef PlaySound + #undef PlaySound + #ifdef _UNICODE + inline BOOL PlaySound(LPCWSTR pszSound, HMODULE hMod, DWORD fdwSound) + { + return PlaySoundW(pszSound, hMod, fdwSound); + } + #else + inline BOOL PlaySound(LPCSTR pszSound, HMODULE hMod, DWORD fdwSound) + { + return PlaySoundA(pszSound, hMod, fdwSound); + } + #endif +#endif + // GetClassName #ifdef GetClassName @@ -273,6 +308,11 @@ } #endif + +#ifdef Yield + #undef Yield +#endif + // GetWindowProc //ifdef GetWindowProc // #undef GetWindowProc