use wxMac provided wxGetOsDescription with Apple DevTools

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index d7e671c58236cdf3330c776f5f1ed5f1be880b47..2e2ffd6c4a37c12ccabd251f0f11d7a7adcc1301 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -486,5 +486,11 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 wxString wxGetOsDescription()
 {
 
 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 d7e671c58236cdf3330c776f5f1ed5f1be880b47..2e2ffd6c4a37c12ccabd251f0f11d7a7adcc1301 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -486,5 +486,11 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 wxString wxGetOsDescription()
 {
 
 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 6fdbc765eb491206f5fd11929e60d9300c556bbe..171918e24ea3c1cd9e1411dd6515080b04de2887 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -948,6 +948,7 @@ bool wxGetUserName(wxChar *buf, int sz)
     return FALSE;
 }
 
     return FALSE;
 }
 

+#ifndef __WXMAC__

 wxString wxGetOsDescription()
 {
 #ifndef WXWIN_OS_DESCRIPTION
 wxString wxGetOsDescription()
 {
 #ifndef WXWIN_OS_DESCRIPTION


@@ -956,6 +957,7 @@ wxString wxGetOsDescription()
     return WXWIN_OS_DESCRIPTION;
 #endif
 }
     return WXWIN_OS_DESCRIPTION;
 #endif
 }

+#endif

 
 // this function returns the GUI toolkit version in GUI programs, but OS
 // version in non-GUI ones
 
 // this function returns the GUI toolkit version in GUI programs, but OS
 // version in non-GUI ones