X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..4c68a10264347cc04b1a6634000595f160792231:/include/wx/msw/winundef.h?ds=inline diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 7a078f9a76..ece9c4c92a 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -25,6 +25,54 @@ // elsewhere because the functions, unlike the macros, respect the scope. // ---------------------------------------------------------------------------- +// CreateDialog + +#if defined(CreateDialog) + #undef CreateDialog + + inline HWND CreateDialog(HINSTANCE hInstance, + LPCTSTR pTemplate, + HWND hwndParent, + DLGPROC pDlgProc) + { + #ifdef _UNICODE + return CreateDialogW(hInstance, pTemplate, hwndParent, pDlgProc); + #else + return CreateDialogA(hInstance, pTemplate, hwndParent, pDlgProc); + #endif + } +#endif + +// LoadMenu + +#ifdef LoadMenu + #undef LoadMenu + + inline HMENU LoadMenu(HINSTANCE instance, LPCTSTR name) + { + #ifdef _UNICODE + return LoadMenuW(instance, name); + #else + return LoadMenuA(instance, name); + #endif + } +#endif + +// FindText + +#ifdef FindText + #undef FindText + + inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace) + { + #ifdef UNICODE + return FindTextW(lpfindreplace); + #else + return FindTextA(lpfindreplace); + #endif // !UNICODE + } +#endif + // GetCharWidth #ifdef GetCharWidth @@ -56,6 +104,23 @@ #endif #endif +// PlaySound + +#ifdef PlaySound + #undef PlaySound + #ifdef _UNICODE + inline BOOL PlaySound(LPCWSTR pszSound, HMODULE hMod, DWORD fdwSound) + { + return PlaySoundW(pszSound, hMod, fdwSound); + } + #else + inline BOOL PlaySound(LPCSTR pszSound, HMODULE hMod, DWORD fdwSound) + { + return PlaySoundA(pszSound, hMod, fdwSound); + } + #endif +#endif + // GetClassName #ifdef GetClassName @@ -124,23 +189,36 @@ #endif #endif + +/* + When this file is included, sometimes the wxCHECK_W32API_VERSION macro + is undefined. With for example CodeWarrior this gives problems with + the following code: + #if 0 && wxCHECK_W32API_VERSION( 0, 5 ) + Because CodeWarrior does macro expansion before test evaluation. + We define wxCHECK_W32API_VERSION here if it's undefined. +*/ +#if !defined(__GNUG__) && !defined(wxCHECK_W32API_VERSION) + #define wxCHECK_W32API_VERSION(maj, min) (0) +#endif + // StartDoc #ifdef StartDoc #undef StartDoc - #ifdef __GNUG__ + #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 ) #define DOCINFOW DOCINFO #define DOCINFOA DOCINFO #endif #ifdef _UNICODE inline int StartDoc(HDC h, CONST DOCINFOW* info) { - return StartDocW(h, info); + return StartDocW(h, (DOCINFOW*) info); } #else inline int StartDoc(HDC h, CONST DOCINFOA* info) { - return StartDocA(h, info); + return StartDocA(h, (DOCINFOA*) info); } #endif #endif @@ -173,6 +251,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 @@ -212,7 +316,11 @@ #undef IsMaximized inline BOOL IsMaximized(HWND hwnd) { +#ifdef __WXWINCE__ + return FALSE; +#else return IsZoomed(hwnd); +#endif } #endif @@ -222,7 +330,11 @@ #undef GetFirstChild inline HWND GetFirstChild(HWND hwnd) { +#ifdef __WXWINCE__ + return 0; +#else return GetTopWindow(hwnd); +#endif } #endif @@ -248,7 +360,7 @@ // For WINE -#if defined(GetWindowStyle) || defined(__WXWINE__) +#if defined(GetWindowStyle) #undef GetWindowStyle #endif @@ -273,6 +385,21 @@ } #endif + +#ifdef Yield + #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