RenameEntry/Group() functions added to wxConfig and derivations (not yet

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index d845ed71da1df03f7503839075bbe8ba81b8f6e7..fc82bca82c348233741d15691a439a63cfe228cb 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -51,8 +51,14 @@
 #endif
 #endif
 #include <time.h>
 #endif
 #endif
 #include <time.h>

+#ifndef __MWERKS__

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#endif
+
+#ifdef __SALFORDC__
+#include <clib.h>
+#endif

 
 // Pattern matching code.
 // Yes, this path is deliberate (for Borland compilation)
 
 // Pattern matching code.
 // Yes, this path is deliberate (for Borland compilation)


@@ -70,6 +76,36 @@
 
 extern char *wxBuffer;
 
 
 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
 #ifdef __VMS__
 // we have no strI functions under VMS, therefore I have implemented
 // an inefficient but portable version: convert copies of strings to lowercase


@@ -118,8 +154,13 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 #ifdef __WINDOWS__
 
 #ifndef __GNUWIN32__
 #ifdef __WINDOWS__
 
 #ifndef __GNUWIN32__

+#ifndef __MWERKS__

 #define strcasecmp stricmp
 #define strncasecmp strnicmp
 #define strcasecmp stricmp
 #define strncasecmp strnicmp

+#else
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#endif

 #endif
 
 #ifdef _MSC_VER
 #endif
 
 #ifdef _MSC_VER


@@ -445,7 +486,7 @@ wxFindWindowByLabel1 (const wxString& title, wxWindow * parent)
 
   if (parent)
     {
 
   if (parent)
     {

-      for (wxNode * node = parent->GetChildren()->First (); node; node = node->Next ())
+      for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())

        {
          wxWindow *win = (wxWindow *) node->Data ();
          wxWindow *retwin = wxFindWindowByLabel1 (title, win);
        {
          wxWindow *win = (wxWindow *) node->Data ();
          wxWindow *retwin = wxFindWindowByLabel1 (title, win);


@@ -501,7 +542,7 @@ wxFindWindowByName1 (const wxString& title, wxWindow * parent)
 
   if (parent)
     {
 
   if (parent)
     {

-      for (wxNode * node = parent->GetChildren()->First (); node; node = node->Next ())
+      for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())

        {
          wxWindow *win = (wxWindow *) node->Data ();
          wxWindow *retwin = wxFindWindowByName1 (title, win);
        {
          wxWindow *win = (wxWindow *) node->Data ();
          wxWindow *retwin = wxFindWindowByName1 (title, win);


@@ -525,54 +566,6 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
   return menuBar->FindMenuItem (menuString, itemString);
 }
 
   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:
 
 /*
 On Fri, 21 Jul 1995, Paul Craven wrote:
 


@@ -807,3 +800,14 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
         return wxString("");
 }
 
         return wxString("");
 }
 

+#ifdef __MWERKS__
+char *strdup(const char *s) 
+{
+       return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ;
+}
+
+int    isascii( int c ) 
+{
+       return ( c >= 0 && c < 128 ) ;
+}
+#endif