Blind fix for bug #529874 .

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 066f36c368f3b962eb112ac4c8b82961fdf3095d..4cd5021df42e488281de938dfe8593dfbb2fefb8 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -111,12 +111,25 @@ bool wxGetUserName(char *buf, int maxSize)
   return TRUE;
 }
 
   return TRUE;
 }
 

-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig , wxKillError *rc )

 {
     // TODO
     return 0;
 }
 
 {
     // TODO
     return 0;
 }
 

+WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
+{
+  // TODO : under classic there is no environement support, under X yes
+  return false ;
+}
+
+// set the env var name to the given value, return TRUE on success
+WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
+{
+  // TODO : under classic there is no environement support, under X yes
+  return false ;
+}
+

 //
 // Execute a program in an Interactive Shell
 //
 //
 // Execute a program in an Interactive Shell
 //


@@ -151,6 +164,8 @@ void wxFlushEvents()
 {
 }
 
 {
 }
 

+#if WXWIN_COMPATIBILITY_2_2
+

 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {
 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {


@@ -185,6 +200,9 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
   wxMessageBox(wxBuffer);
   wxExit();
 }

+
+#endif // WXWIN_COMPATIBILITY_2_2
+

 #endif // !__DARWIN__
 
 // Emit a beeeeeep
 #endif // !__DARWIN__
 
 // Emit a beeeeeep


@@ -470,3 +488,14 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);
 }
 {
     return wxGenericFindWindowAtPoint(pt);
 }

+
+wxString wxGetOsDescription()
+{
+#ifdef WXWIN_OS_DESCRIPTION
+    // use configure generated description if available
+    return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+#else
+    return "MacOS" ; //TODO:define further
+#endif
+}
+