applying patch 1894478
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -641,14 +641,26 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
|
||||
|
||||
#if wxUSE_BASE
|
||||
|
||||
#ifdef __DARWIN__
|
||||
#include <sys/utsname.h>
|
||||
#endif
|
||||
|
||||
wxString wxGetOsDescription()
|
||||
{
|
||||
#ifdef __DARWIN__
|
||||
char data[128];
|
||||
struct utsname name;
|
||||
uname(&name);
|
||||
sprintf(data, "Mac OS X (%s %s %s)", name.sysname, name.release, name.machine);
|
||||
return wxString(data, wxConvUTF8);
|
||||
#else
|
||||
#ifdef WXWIN_OS_DESCRIPTION
|
||||
// use configure generated description if available
|
||||
return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
|
||||
#else
|
||||
return wxT("MacOS"); //TODO:define further
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef __DARWIN__
|
||||
|
Reference in New Issue
Block a user