X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/731db7098007e6cad7363300510e1538b6780196..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 2a63c4864b..9247673876 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,7 +27,7 @@ // CreateDialog -#ifdef CreateDialog +#if defined(CreateDialog) #undef CreateDialog inline HWND CreateDialog(HINSTANCE hInstance, @@ -43,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 @@ -58,6 +116,21 @@ } #endif +// FindText + +#ifdef FindText + #undef FindText + + inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace) + { + #ifdef _UNICODE + return FindTextW(lpfindreplace); + #else + return FindTextA(lpfindreplace); + #endif + } +#endif + // GetCharWidth #ifdef GetCharWidth @@ -174,14 +247,21 @@ #endif #endif + // StartDoc #ifdef StartDoc #undef StartDoc - #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 ) - #define DOCINFOW DOCINFO - #define DOCINFOA DOCINFO + + // Work around a bug in very old MinGW headers that didn't define DOCINFOW + // and DOCINFOA but only DOCINFO in both ANSI and Unicode. + #if defined( __GNUG__ ) + #if !wxCHECK_W32API_VERSION( 0, 5 ) + #define DOCINFOW DOCINFO + #define DOCINFOA DOCINFO + #endif #endif + #ifdef _UNICODE inline int StartDoc(HDC h, CONST DOCINFOW* info) { @@ -223,6 +303,32 @@ } #endif +// LoadIcon +#ifdef LoadIcon + #undef LoadIcon + inline HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName) + { + #ifdef _UNICODE + return LoadIconW(hInstance, lpIconName); + #else // ANSI + return LoadIconA(hInstance, lpIconName); + #endif // Unicode/ANSI + } +#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 #ifdef LoadLibrary @@ -260,9 +366,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 @@ -270,9 +380,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 @@ -298,7 +432,7 @@ // For WINE -#if defined(GetWindowStyle) || defined(__WXWINE__) +#if defined(GetWindowStyle) #undef GetWindowStyle #endif @@ -328,6 +462,16 @@ #undef Yield #endif + +#if defined(__WXWINCE__) && defined(DrawIcon) //#ifdef DrawIcon + #undef DrawIcon + inline BOOL DrawIcon(HDC hdc, int x, int y, HICON hicon) + { + return DrawIconEx(hdc,x,y,hicon,0,0,0,NULL, DI_NORMAL) ; + } +#endif + + // GetWindowProc //ifdef GetWindowProc // #undef GetWindowProc