X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..1aaf88d2208793f6a05f02c3e23ade668555d31e:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 5cacd2a37d..3d8a52e020 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -6,7 +6,7 @@ // Created: 16.05.99 // RCS-ID: $Id$ // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /* THIS SHOULD NOT BE USED since you might include it once e.g. in window.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 @@ -317,6 +341,7 @@ inline BOOL IsMaximized(HWND hwnd) { #ifdef __WXWINCE__ + wxUnusedVar(hwnd); return FALSE; #else return IsZoomed(hwnd); @@ -331,6 +356,7 @@ inline HWND GetFirstChild(HWND hwnd) { #ifdef __WXWINCE__ + wxUnusedVar(hwnd); return 0; #else return GetTopWindow(hwnd); @@ -393,7 +419,7 @@ #if defined(__WXWINCE__) && defined(DrawIcon) //#ifdef DrawIcon #undef DrawIcon - inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon) + inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon) { return DrawIconEx(hdc,x,y,hicon,0,0,0,NULL, DI_NORMAL) ; }