use MoreFiles under Mac OS X

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index f9f3116ca3e0ab958acea3b01aea9fdd09e105d5..2b812d81bfe2dd010e4f3798584a9e60c7bfc583 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -105,7 +105,7 @@
 // string functions
 // ----------------------------------------------------------------------------
 
 // string functions
 // ----------------------------------------------------------------------------
 

-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__DARWIN__)

 int strcasecmp(const char *str_1, const char *str_2)
 {
   register char c1, c2;
 int strcasecmp(const char *str_1, const char *str_2)
 {
   register char c1, c2;


@@ -134,7 +134,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
   return 0 ;
 
 }
   return 0 ;
 
 }

-#endif // wxMAC
+#endif // __WXMAC__ && !__DARWIN__

 
 #if defined( __VMS__ ) && ( __VMS_VER < 70000000 )
 // we have no strI functions under VMS, therefore I have implemented
 
 #if defined( __VMS__ ) && ( __VMS_VER < 70000000 )
 // we have no strI functions under VMS, therefore I have implemented


@@ -1072,6 +1072,21 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

+const wxChar *wxGetInstallPrefix()
+{
+    wxString prefix;
+    
+    if ( wxGetEnv(wxT("WX_PREFIX"), &prefix) )
+        return prefix.c_str();
+    
+#ifdef wxINSTALL_PREFIX
+    return wxT(wxINSTALL_PREFIX);
+#else 
+    return wxT("");
+#endif
+}
+
+

 // ----------------------------------------------------------------------------
 // network and user id functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // network and user id functions
 // ----------------------------------------------------------------------------