X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ec9d18f1b2c3d370190560e4cb5ba0997a2e778..222594ead7a8ed85cb0c709850b2eed07fc3ac86:/include/wx/msw/winundef.h?ds=sidebyside diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 25bcb7d67e..04ab36ae4d 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -9,10 +9,21 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +/* THIS SHOULD NOT BE USED since you might include it once e.g. in window.h, + * then again _AFTER_ you've included windows.h, in which case it won't work + * a 2nd time -- JACS #ifndef _WX_WINUNDEF_H_ #define _WX_WINUNDEF_H_ + */ -// windows.h #defines the following identifiers which are also used in wxWin +// ---------------------------------------------------------------------------- +// windows.h #defines the following identifiers which are also used in wxWin so +// we replace these symbols with the corresponding inline functions and +// undefine the macro. +// +// This looks quite ugly here but allows us to write clear (and correct!) code +// elsewhere because the functions, unlike the macros, respect the scope. +// ---------------------------------------------------------------------------- // GetCharWidth @@ -117,7 +128,7 @@ #ifdef StartDoc #undef StartDoc - #ifdef __MINGW32__ + #ifdef __GNUG__ #define DOCINFOW DOCINFO #define DOCINFOA DOCINFO #endif @@ -148,6 +159,7 @@ } #endif +// GetMessage #ifdef GetMessage #undef GetMessage @@ -161,6 +173,65 @@ } #endif +// LoadLibrary + +#ifdef LoadLibrary + #undef LoadLibrary + inline HINSTANCE LoadLibrary(LPCTSTR lpLibFileName) + { + #ifdef _UNICODE + return LoadLibraryW(lpLibFileName); + #else + return LoadLibraryA(lpLibFileName); + #endif + } +#endif + +// IsMaximized + +#ifdef IsMaximized + #undef IsMaximized + inline BOOL IsMaximized(HWND hwnd) + { + return IsZoomed(hwnd); + } +#endif + +// GetFirstChild + +#ifdef GetFirstChild + #undef GetFirstChild + inline HWND GetFirstChild(HWND hwnd) + { + return GetTopWindow(hwnd); + } +#endif + +// GetPrevSibling + +#ifdef GetPrevSibling + #undef GetPrevSibling + inline HWND GetPrevSibling(HWND hwnd) + { + return GetWindow(hwnd,GW_HWNDPREV); + } +#endif + +// GetNextSibling + +#ifdef GetNextSibling + #undef GetNextSibling + inline HWND GetNextSibling(HWND hwnd) + { + return GetWindow(hwnd,GW_HWNDNEXT); + } +#endif + +// For WINE + +#if defined(GetWindowStyle) || defined(__WXWINE__) + #undef GetWindowStyle +#endif // For ming and cygwin @@ -191,4 +262,5 @@ // #undef GetNextChild //endif -#endif // _WX_WINUNDEF_H_ +// #endif // _WX_WINUNDEF_H_ +