Remove wxApp::GetShell32Version().
This method was only used for checks for Windows 9x versions of shell32. See ticket: #17120
This commit is contained in:
@@ -892,37 +892,6 @@ int wxApp::GetComCtl32Version()
|
||||
return s_verComCtl32;
|
||||
}
|
||||
|
||||
/* static */
|
||||
int wxApp::GetShell32Version()
|
||||
{
|
||||
static int s_verShell32 = -1;
|
||||
if ( s_verShell32 == -1 )
|
||||
{
|
||||
// we're prepared to handle the errors
|
||||
wxLogNull noLog;
|
||||
|
||||
wxDynamicLibrary dllShell32(wxT("shell32.dll"), wxDL_VERBATIM);
|
||||
if ( dllShell32.IsLoaded() )
|
||||
{
|
||||
s_verShell32 = CallDllGetVersion(dllShell32);
|
||||
|
||||
if ( !s_verShell32 )
|
||||
{
|
||||
// there doesn't seem to be any way to distinguish between 4.00
|
||||
// and 4.70 (starting from 4.71 we have DllGetVersion()) so
|
||||
// just assume it is 4.0
|
||||
s_verShell32 = 400;
|
||||
}
|
||||
}
|
||||
else // failed load the DLL?
|
||||
{
|
||||
s_verShell32 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return s_verShell32;
|
||||
}
|
||||
|
||||
#else // !wxUSE_DYNLIB_CLASS
|
||||
|
||||
/* static */
|
||||
@@ -931,12 +900,6 @@ int wxApp::GetComCtl32Version()
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* static */
|
||||
int wxApp::GetShell32Version()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
|
||||
|
||||
#if wxUSE_EXCEPTIONS
|
||||
|
||||
Reference in New Issue
Block a user