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
This commit is contained in:
@@ -43,6 +43,30 @@
|
|||||||
}
|
}
|
||||||
#endif
|
#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
|
// LoadMenu
|
||||||
|
|
||||||
#ifdef LoadMenu
|
#ifdef LoadMenu
|
||||||
|
Reference in New Issue
Block a user