merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -177,27 +177,33 @@
|
||||
|
||||
#ifdef LoadLibrary
|
||||
#undef LoadLibrary
|
||||
inline HINSTANCE LoadLibrary(LPCTSTR lpLibFileName)
|
||||
{
|
||||
#ifdef _UNICODE
|
||||
inline HINSTANCE LoadLibrary(LPCWSTR lpLibFileName)
|
||||
{
|
||||
return LoadLibraryW(lpLibFileName);
|
||||
#else
|
||||
return LoadLibraryA(lpLibFileName);
|
||||
#endif
|
||||
}
|
||||
#else
|
||||
inline HINSTANCE LoadLibrary(LPCSTR lpLibFileName)
|
||||
{
|
||||
return LoadLibraryA(lpLibFileName);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// FindResource
|
||||
#ifdef FindResource
|
||||
#undef FindResource
|
||||
inline HRSRC FindResource(HMODULE hModule, LPCTSTR lpName, LPCTSTR lpType)
|
||||
{
|
||||
#ifdef _UNICODE
|
||||
inline HRSRC FindResource(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType)
|
||||
{
|
||||
return FindResourceW(hModule, lpName, lpType);
|
||||
#else
|
||||
return FindResourceA(hModule, lpName, lpType);
|
||||
#endif
|
||||
}
|
||||
#else
|
||||
inline HRSRC FindResource(HMODULE hModule, LPCSTR lpName, LPCSTR lpType)
|
||||
{
|
||||
return FindResourceA(hModule, lpName, lpType);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// IsMaximized
|
||||
|
Reference in New Issue
Block a user