Don't do the wx cleanup if wxPython didn't do the initialization.

[wxWidgets.git] / src / mac / utils.cpp

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index d7e671c58236cdf3330c776f5f1ed5f1be880b47..4cd5021df42e488281de938dfe8593dfbb2fefb8 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -164,6 +164,8 @@ void wxFlushEvents()
 {
 }
 
+#if WXWIN_COMPATIBILITY_2_2
+
 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {
@@ -198,6 +200,9 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
 #endif // !__DARWIN__
 
 // Emit a beeeeeep
@@ -486,5 +491,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
+}
+