X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/381adb7449f4042d4be496273edfcbaddc21b8d6..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/msw/winundef.h?ds=sidebyside diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 6c0b049f29..a3fd4e2ce7 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -5,7 +5,7 @@ // Modified by: // Created: 16.05.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -27,8 +27,7 @@ // CreateDialog -//#ifdef(CreateDialog) -#if !defined(__WXWINCE__) && defined(CreateDialog) +#if defined(CreateDialog) #undef CreateDialog inline HWND CreateDialog(HINSTANCE hInstance, @@ -44,6 +43,64 @@ } #endif +// CreateFont + +#ifdef CreateFont + #undef CreateFont + + inline HFONT CreateFont(int height, + int width, + int escapement, + int orientation, + int weight, + DWORD italic, + DWORD underline, + DWORD strikeout, + DWORD charset, + DWORD outprecision, + DWORD clipprecision, + DWORD quality, + DWORD family, + LPCTSTR facename) + { + #ifdef _UNICODE + return CreateFontW(height, width, escapement, orientation, + weight, italic, underline, strikeout, charset, + outprecision, clipprecision, quality, + family, facename); + #else + return CreateFontA(height, width, escapement, orientation, + weight, italic, underline, strikeout, charset, + outprecision, clipprecision, quality, + family, facename); + #endif + } +#endif // CreateFont + +// 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 @@ -315,9 +372,13 @@ #ifdef IsMaximized #undef IsMaximized - inline BOOL IsMaximized(HWND hwnd) + inline BOOL IsMaximized(HWND WXUNUSED_IN_WINCE(hwnd)) { +#ifdef __WXWINCE__ + return FALSE; +#else return IsZoomed(hwnd); +#endif } #endif @@ -325,9 +386,33 @@ #ifdef GetFirstChild #undef GetFirstChild - inline HWND GetFirstChild(HWND hwnd) + inline HWND GetFirstChild(HWND WXUNUSED_IN_WINCE(hwnd)) { +#ifdef __WXWINCE__ + return 0; +#else return GetTopWindow(hwnd); +#endif + } +#endif + +// GetFirstSibling + +#ifdef GetFirstSibling + #undef GetFirstSibling + inline HWND GetFirstSibling(HWND hwnd) + { + return GetWindow(hwnd,GW_HWNDFIRST); + } +#endif + +// GetLastSibling + +#ifdef GetLastSibling + #undef GetLastSibling + inline HWND GetLastSibling(HWND hwnd) + { + return GetWindow(hwnd,GW_HWNDLAST); } #endif @@ -386,7 +471,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) ; }