X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ba3d4f0dd7b65d2f35b67e5c30ebae9b01c9445..659d096cea6ae59cc57758ee239f5ddf0181e7bc:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 2217085e1e..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,14 +177,33 @@ #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 @@ -207,6 +226,26 @@ } #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__)