From 6e73695c5926acc28c1aeb952e6322e2f8b8ef6e Mon Sep 17 00:00:00 2001
From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sun, 20 Jan 2002 18:22:48 +0000
Subject: [PATCH] use wxMac provided wxGetOsDescription with Apple DevTools

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/utils.cpp | 10 ++++++++--
 src/mac/utils.cpp        | 10 ++++++++--
 src/unix/utilsunx.cpp    |  2 ++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index d7e671c582..2e2ffd6c4a 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -486,5 +486,11 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 wxString wxGetOsDescription()
 {
-  return "MacOS" ; //TODO:define further
-}
\ No newline at end of file
+#ifdef WXWIN_OS_DESCRIPTION
+    // use configure generated description if available
+    return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+#else
+    return "MacOS" ; //TODO:define further
+#endif
+}
+
diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index d7e671c582..2e2ffd6c4a 100644
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -486,5 +486,11 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 wxString wxGetOsDescription()
 {
-  return "MacOS" ; //TODO:define further
-}
\ No newline at end of file
+#ifdef WXWIN_OS_DESCRIPTION
+    // use configure generated description if available
+    return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+#else
+    return "MacOS" ; //TODO:define further
+#endif
+}
+
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 6fdbc765eb..171918e24e 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -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
-- 
2.47.2