X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e2411ab49b01f0dbbc1a5f42f1914c85e476d73..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/winundef.h?ds=sidebyside diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index a3f6a6c99d..41cea6dc90 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 @@ -66,11 +123,11 @@ inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace) { - #ifdef UNICODE + #ifdef _UNICODE return FindTextW(lpfindreplace); #else return FindTextA(lpfindreplace); - #endif // !UNICODE + #endif } #endif @@ -265,6 +322,18 @@ } #endif // LoadIcon +// LoadBitmap +#ifdef LoadBitmap + #undef LoadBitmap + inline HBITMAP LoadBitmap(HINSTANCE hInstance, LPCTSTR lpBitmapName) + { + #ifdef _UNICODE + return LoadBitmapW(hInstance, lpBitmapName); + #else // ANSI + return LoadBitmapA(hInstance, lpBitmapName); + #endif // Unicode/ANSI + } +#endif // LoadBitmap // LoadLibrary @@ -303,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 @@ -313,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 @@ -341,7 +438,7 @@ // For WINE -#if defined(GetWindowStyle) || defined(__WXWINE__) +#if defined(GetWindowStyle) #undef GetWindowStyle #endif @@ -374,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) ; }