X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cc98b3e3fbe91688e1ff8852a03e589aec5c866..d42508c2a026d505d39c386b233de4a1b51f1445:/include/wx/msw/winundef.h?ds=sidebyside diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 6af2f389cc..7a078f9a76 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -128,7 +128,7 @@ #ifdef StartDoc #undef StartDoc - #ifdef __GNUWIN32__ + #ifdef __GNUG__ #define DOCINFOW DOCINFO #define DOCINFOA DOCINFO #endif @@ -177,13 +177,72 @@ #ifdef LoadLibrary #undef LoadLibrary - inline HINSTANCE LoadLibrary(LPCTSTR lpLibFileName) - { #ifdef _UNICODE + inline HINSTANCE LoadLibrary(LPCWSTR lpLibFileName) + { return LoadLibraryW(lpLibFileName); + } #else + inline HINSTANCE LoadLibrary(LPCSTR lpLibFileName) + { return LoadLibraryA(lpLibFileName); + } #endif +#endif + +// FindResource +#ifdef FindResource + #undef FindResource + #ifdef _UNICODE + inline HRSRC FindResource(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType) + { + return FindResourceW(hModule, lpName, lpType); + } + #else + inline HRSRC FindResource(HMODULE hModule, LPCSTR lpName, LPCSTR lpType) + { + return FindResourceA(hModule, lpName, lpType); + } + #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