splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 7c8de25d0bb2a8de7cbb621a04878ed9eed7007b..e302a68cdd15bad134a14efb658bcda4e00ef076 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -37,9 +37,8 @@
 
 // #include "MoreFilesX.h"
 
 
 // #include "MoreFilesX.h"
 

-#ifndef __DARWIN__
-    #include <Threads.h>
-    #include <Sound.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    #include <AudioToolbox/AudioServices.h>

 #endif
 
 #if wxUSE_GUI
 #endif
 
 #if wxUSE_GUI


@@ -87,8 +86,16 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
 // Emit a beeeeeep
 void wxBell()
 {
 // Emit a beeeeeep
 void wxBell()
 {

-#ifndef __LP64__
-    SysBeep(30);
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    if ( AudioServicesPlayAlertSound )
+        AudioServicesPlayAlertSound(kUserPreferredAlert);
+    else
+#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+        SysBeep(30);
+#else
+    {
+    }

 #endif
 }
 
 #endif
 }
 


@@ -126,6 +133,8 @@ void wxBeginBusyCursor(const wxCursor *cursor)
     {
         gMacStoredActiveCursor = gMacCurrentCursor;
         cursor->MacInstall();
     {
         gMacStoredActiveCursor = gMacCurrentCursor;
         cursor->MacInstall();

+
+        wxSetCursor(*cursor);

     }
     //else: nothing to do, already set
 }
     }
     //else: nothing to do, already set
 }


@@ -140,6 +149,8 @@ void wxEndBusyCursor()
     {
         gMacStoredActiveCursor.MacInstall();
         gMacStoredActiveCursor = wxNullCursor;
     {
         gMacStoredActiveCursor.MacInstall();
         gMacStoredActiveCursor = wxNullCursor;

+
+        wxSetCursor(wxNullCursor);

     }
 }
 
     }
 }
 


@@ -299,14 +310,17 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE
 

+#include <sys/utsname.h>
+

 wxString wxGetOsDescription()
 {
 wxString wxGetOsDescription()
 {

-#ifdef WXWIN_OS_DESCRIPTION
-    // use configure generated description if available
-    return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
-#else
-    return wxT("MacOS"); //TODO:define further
-#endif
+    char data[128];
+    struct utsname name;
+    uname(&name);
+       return wxString::Format(_T("Mac OS X (%s %s %s)"),
+                       wxString::FromAscii(name.sysname).c_str(),
+                       wxString::FromAscii(name.release).c_str(),
+                       wxString::FromAscii(name.machine).c_str());

 }
 
 #ifndef __DARWIN__
 }
 
 #ifndef __DARWIN__