Added (untested) support for sub-locales.

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index a5f03d0543d11d034da7037548f4483a2fa0f972..1488ca866c31987d44299d160ce9c6ad802b81a3 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -56,6 +56,10 @@
 #include <sys/stat.h>
 #endif
 
+#ifdef __SALFORDC__
+#include <clib.h>
+#endif
+
 // Pattern matching code.
 // Yes, this path is deliberate (for Borland compilation)
 #ifdef wx_mac /* MATTHEW: [5] Mac doesn't like paths with "/" */
@@ -72,6 +76,36 @@
 
 extern char *wxBuffer;
 
+#ifdef __WXMAC__
+int strcasecmp(const char *str_1, const char *str_2)
+{
+  register char c1, c2;
+  do {
+    c1 = tolower(*str_1++);
+    c2 = tolower(*str_2++);
+  } while ( c1 && (c1 == c2) );
+
+  return c1 - c2;
+}
+
+int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
+{
+
+  register char c1, c2;
+  while( maxchar--) 
+  {
+    c1 = tolower(*str_1++);
+    c2 = tolower(*str_2++);
+    
+    if ( !c1 || c1!=c2 )
+               return c1 - c2;
+                   
+  } ;
+
+  return 0 ;
+
+}
+#endif
 #ifdef __VMS__
 // we have no strI functions under VMS, therefore I have implemented
 // an inefficient but portable version: convert copies of strings to lowercase
@@ -532,54 +566,6 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
   return menuBar->FindMenuItem (menuString, itemString);
 }
 
-/*
- * wxDebugStreamBuf
- */
-#if !defined(_WINDLL)
- 
-wxDebugStreamBuf::wxDebugStreamBuf(void)
-{
-       // <iostream> usage doesn't need this, and i have no idea how to simulate it.
-#if wxUSE_IOSTREAMH
-       if (allocate())
-         setp(base(),ebuf());
-#endif
-}
-
-int wxDebugStreamBuf::overflow(int WXUNUSED(i))
-{
-  int len = pptr() - pbase();
-  char *txt = new char[len+1];
-  strncpy(txt, pbase(), len);
-  txt[len] = '\0';
-#ifdef __WXMSW__
-  OutputDebugString((LPCSTR)txt);
-#else
-  fprintf(stderr, txt);
-#endif
-  setp(pbase(), epptr());
-  delete[] txt;
-  return EOF;
-}
-
-int wxDebugStreamBuf::sync(void)
-{
-  int len = pptr() - pbase();
-  char *txt = new char[len+1];
-  strncpy(txt, pbase(), len);
-  txt[len] = '\0';
-#ifdef __WXMSW__
-  OutputDebugString((LPCSTR)txt);
-#else
-  fprintf(stderr, txt);
-#endif
-  setp(pbase(), epptr());
-  delete[] txt;
-  return 0;
-}
-
-#endif
-
 /*
 On Fri, 21 Jul 1995, Paul Craven wrote:
 
@@ -824,4 +810,42 @@ int        isascii( int c )
 {
        return ( c >= 0 && c < 128 ) ;
 }
-#endif
\ No newline at end of file
+#endif
+
+// Overloaded functions, taking a wxString
+bool wxGetHostName(wxString& name)
+{
+    bool success = wxGetHostName(wxBuffer, 500);
+    if (success)
+    {
+        name = wxBuffer;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+bool wxGetUserId(wxString& buf)
+{
+    bool success = wxGetUserId(wxBuffer, 500);
+    if (success)
+    {
+        buf = wxBuffer;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+bool wxGetUserName(wxString& buf)
+{
+    bool success = wxGetUserName(wxBuffer, 500);
+    if (success)
+    {
+        buf = wxBuffer;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+