Author: matt
Date: 2010-03-10 14:12:20 -0800 (Wed, 10 Mar 2010)
New Revision: 7238
Log:
Remove one OS X warning about deprecates function.
Modified:
branches/branch-1.3/src/fl_ask.cxx
Modified: branches/branch-1.3/src/fl_ask.cxx
===================================================================
--- branches/branch-1.3/src/fl_ask.cxx 2010-03-10 21:46:42 UTC (rev 7237)
+++ branches/branch-1.3/src/fl_ask.cxx 2010-03-10 22:12:20 UTC (rev 7238)
@@ -48,7 +48,9 @@
#include <FL/fl_draw.H>
#ifdef __APPLE__
-//# include <AudioToolbox/AudioToolbox.h>
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+# include <AudioToolbox/AudioServices.h>
+# endif
#endif
static Fl_Window *message_form;
@@ -279,9 +281,24 @@
case FL_BEEP_ERROR :
// How Apple is not any better than Microsoft:
/* MacOS 8 */ // SysBeep(30);
- /* OS X 10.1 */ AlertSoundPlay();
+ /* OS X 10.1 */ // AlertSoundPlay();
/* OS X 10.5 */ // AudioServicesPlayAlertSound(kUserPreferredAlert);
/* OS X 10.6 */ //
AudioServicesPlayAlertSound(kSystemSoundID_UserPreferredAlert);
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+ if (AudioServicesPlayAlertSound!=0L)
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+ AudioServicesPlayAlertSound(kSystemSoundID_UserPreferredAlert);
+# else
+ AudioServicesPlayAlertSound(kUserPreferredAlert);
+# endif
+ else
+# endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+ AlertSoundPlay();
+#else
+ {
+ }
+#endif
break;
default :
break;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
