use wxMac provided wxGetOsDescription with Apple DevTools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -486,5 +486,11 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
|
||||
|
||||
wxString wxGetOsDescription()
|
||||
{
|
||||
return "MacOS" ; //TODO:define further
|
||||
}
|
||||
#ifdef WXWIN_OS_DESCRIPTION
|
||||
// use configure generated description if available
|
||||
return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
|
||||
#else
|
||||
return "MacOS" ; //TODO:define further
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@@ -486,5 +486,11 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
|
||||
|
||||
wxString wxGetOsDescription()
|
||||
{
|
||||
return "MacOS" ; //TODO:define further
|
||||
}
|
||||
#ifdef WXWIN_OS_DESCRIPTION
|
||||
// use configure generated description if available
|
||||
return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
|
||||
#else
|
||||
return "MacOS" ; //TODO:define further
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@@ -948,6 +948,7 @@ bool wxGetUserName(wxChar *buf, int sz)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifndef __WXMAC__
|
||||
wxString wxGetOsDescription()
|
||||
{
|
||||
#ifndef WXWIN_OS_DESCRIPTION
|
||||
@@ -956,6 +957,7 @@ wxString wxGetOsDescription()
|
||||
return WXWIN_OS_DESCRIPTION;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
// this function returns the GUI toolkit version in GUI programs, but OS
|
||||
// version in non-GUI ones
|
||||
|
Reference in New Issue
Block a user