X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfad0599246651d4994e348d868a3e65613c7379..ad5c34f309074eefe625b82e1203eec5b91247f5:/src/common/utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index db15e151fe..2b2e7d65ac 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -32,11 +32,15 @@
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
+#include <fstream.h>
 #else
 #include <iostream>
+#include <fstream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
 #endif
 
-#include <fstream.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,8 +51,10 @@
 #endif
 #endif
 #include <time.h>
+#ifndef __MWERKS__
 #include <sys/types.h>
 #include <sys/stat.h>
+#endif
 
 // Pattern matching code.
 // Yes, this path is deliberate (for Borland compilation)
@@ -66,6 +72,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
@@ -114,8 +150,13 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 #ifdef __WINDOWS__
 
 #ifndef __GNUWIN32__
+#ifndef __MWERKS__
 #define strcasecmp stricmp
 #define strncasecmp strnicmp
+#else
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#endif
 #endif
 
 #ifdef _MSC_VER
@@ -240,19 +281,19 @@ static char hexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A'
   'C', 'D', 'E', 'F' };
 
 // Convert 2-digit hex number to decimal
-int wxHexToDec(char *buf)
+int wxHexToDec(const wxString& buf)
 {
   int firstDigit, secondDigit;
   
-  if (buf[0] >= 'A')
-    firstDigit = buf[0] - 'A' + 10;
+  if (buf.GetChar(0) >= 'A')
+    firstDigit = buf.GetChar(0) - 'A' + 10;
   else
-    firstDigit = buf[0] - '0';
+    firstDigit = buf.GetChar(0) - '0';
 
-  if (buf[1] >= 'A')
-    secondDigit = buf[1] - 'A' + 10;
+  if (buf.GetChar(1) >= 'A')
+    secondDigit = buf.GetChar(1) - 'A' + 10;
   else
-    secondDigit = buf[1] - '0';
+    secondDigit = buf.GetChar(1) - '0';
     
   return firstDigit * 16 + secondDigit;
 }
@@ -267,6 +308,14 @@ void wxDecToHex(int dec, char *buf)
   buf[2] = 0;
 }
 
+// Convert decimal integer to 2-character hex string
+wxString wxDecToHex(int dec)
+{
+    char buf[3];
+    wxDecToHex(dec, buf);
+    return wxString(buf);
+}
+
 // Match a string INDEPENDENT OF CASE
 bool 
 StringMatch (char *str1, char *str2, bool subString, bool exact)
@@ -378,6 +427,14 @@ char *wxStripMenuCodes (char *in, char *out)
   return tmpOut;
 }
 
+wxString wxStripMenuCodes(const wxString& str)
+{
+    char *buf = new char[str.Length() + 1];
+    wxStripMenuCodes((char*) (const char*) str, buf);
+    wxString str1(buf);
+    delete[] buf;
+    return str1;
+}
 
 /*
  * Window search functions
@@ -425,7 +482,7 @@ wxFindWindowByLabel1 (const wxString& title, wxWindow * 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);
@@ -481,7 +538,7 @@ wxFindWindowByName1 (const wxString& title, wxWindow * 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);
@@ -505,50 +562,6 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
   return menuBar->FindMenuItem (menuString, itemString);
 }
 
-/*
- * wxDebugStreamBuf
- */
-#if !defined(_WINDLL)
- 
-wxDebugStreamBuf::wxDebugStreamBuf(void)
-{
-  if (allocate()) setp(base(),ebuf());
-}
-
-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:
 
@@ -783,3 +796,14 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
         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