From 7344726a7a2cad01b8db61a0fea3502e5f904ff6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 13 Dec 2004 21:30:39 +0000 Subject: [PATCH] undef CreateWindow too, even if we don't use it ourselves it's still a very common name and shouldn't be defined after including wxWindows headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/winundef.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 1f711c2c46..3d8a52e020 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -43,6 +43,30 @@ } #endif +// CreateWindow + +#if defined(CreateWindow) + #undef CreateWindow + + inline HWND CreateWindow(LPCTSTR lpClassName, + LPCTSTR lpWndClass, + DWORD dwStyle, + int x, int y, int w, int h, + HWND hWndParent, + HMENU hMenu, + HINSTANCE hInstance, + LPVOID lpParam) + { + #ifdef _UNICODE + return CreateWindowW(lpClassName, lpWndClass, dwStyle, x, y, w, h, + hWndParent, hMenu, hInstance, lpParam); + #else + return CreateWindowA(lpClassName, lpWndClass, dwStyle, x, y, w, h, + hWndParent, hMenu, hInstance, lpParam); + #endif + } +#endif + // LoadMenu #ifdef LoadMenu -- 2.50.0