return wxToolkitInfo by reference and not by pointer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -218,19 +218,19 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
|
||||
#endif
|
||||
}
|
||||
|
||||
wxToolkitInfo *wxConsoleAppTraits::GetToolkitInfo()
|
||||
wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
|
||||
{
|
||||
static wxToolkitInfo info;
|
||||
info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
|
||||
info.name = _T("wxBase");
|
||||
return &info;
|
||||
return info;
|
||||
}
|
||||
|
||||
#endif // wxUSE_BASE
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo()
|
||||
wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
|
||||
{
|
||||
static wxToolkitInfo info;
|
||||
info.os = DoGetOSVersion(&info.majorVersion, &info.minorVersion);
|
||||
@@ -240,7 +240,7 @@ wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo()
|
||||
info.shortName << _T("univ");
|
||||
info.name << _T("/wxUniversal");
|
||||
#endif
|
||||
return &info;
|
||||
return info;
|
||||
}
|
||||
|
||||
// Reading and writing resources (eg WIN.INI, .Xdefaults)
|
||||
|
Reference in New Issue
Block a user