replaced wxAppTraits::GetOSVersion with GetToolkitInfo with richer information that is needed by wxDynamicLibrary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -88,8 +88,9 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
|
||||
// this is in mac/utils.cpp under Mac
|
||||
#ifndef __WXMAC__
|
||||
|
||||
int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
|
||||
wxToolkitInfo *wxConsoleAppTraits::GetToolkitInfo()
|
||||
{
|
||||
static wxToolkitInfo info;
|
||||
int major, minor;
|
||||
char name[256];
|
||||
|
||||
@@ -100,12 +101,12 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
|
||||
minor = -1;
|
||||
}
|
||||
|
||||
if ( verMaj )
|
||||
*verMaj = major;
|
||||
if ( verMin )
|
||||
*verMin = minor;
|
||||
info.versionMajor = major;
|
||||
info.versionMinor = minor;
|
||||
info.name = _T("wxBase");
|
||||
info.os = wxUNIX;
|
||||
|
||||
return wxUNIX;
|
||||
return &info;
|
||||
}
|
||||
|
||||
#endif // __WXMAC__
|
||||
|
Reference in New Issue
Block a user