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:
@@ -133,19 +133,24 @@ void wxBell()
|
||||
XBell (wxGlobalDisplay(), 0);
|
||||
}
|
||||
|
||||
int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
|
||||
wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo()
|
||||
{
|
||||
wxToolkitInfo info;
|
||||
info.shortName = _T("motif");
|
||||
info.name = _T("wxMotif");
|
||||
#ifdef __WXUNIVERSAL__
|
||||
info.shortName << _T("univ");
|
||||
info.name << _T("/wxUniversal");
|
||||
#endif
|
||||
// FIXME TODO
|
||||
// This code is WRONG!! Does NOT return the
|
||||
// Motif version of the libs but the X protocol
|
||||
// version!
|
||||
Display *display = wxGlobalDisplay();
|
||||
if (majorVsn)
|
||||
*majorVsn = ProtocolVersion (display);
|
||||
if (minorVsn)
|
||||
*minorVsn = ProtocolRevision (display);
|
||||
|
||||
return wxMOTIF_X;
|
||||
info.versionMajor = ProtocolVersion (display);
|
||||
info.versionMinor = ProtocolRevision (display);
|
||||
info.os = wxMOTIF_X;
|
||||
return &info;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user