X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f428e6c50f749df492da3d4667c0d457c7863e75..285ba64d0d7e66faae78d357af1cc5386571b654:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 13788c1f85..969366cc08 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 @@ -314,10 +338,9 @@ #ifdef IsMaximized #undef IsMaximized - inline BOOL IsMaximized(HWND hwnd) + inline BOOL IsMaximized(HWND WXUNUSED_IN_WINCE(hwnd)) { #ifdef __WXWINCE__ - wxUnusedVar(hwnd); return FALSE; #else return IsZoomed(hwnd); @@ -329,10 +352,9 @@ #ifdef GetFirstChild #undef GetFirstChild - inline HWND GetFirstChild(HWND hwnd) + inline HWND GetFirstChild(HWND WXUNUSED_IN_WINCE(hwnd)) { #ifdef __WXWINCE__ - wxUnusedVar(hwnd); return 0; #else return GetTopWindow(hwnd); @@ -395,7 +417,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) ; }