X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..9c039d08bfbb59c0abcbc705fb49f9b2cb321edf:/src/gtk1/utilsgtk.cpp

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 050d1718ce..0199458470 100644
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,6 +28,7 @@
 #include <netdb.h>
 #include <signal.h>
 
+
 #ifdef __SVR4__
 #include <sys/systeminfo.h>
 #endif
@@ -80,15 +81,11 @@ int wxDisplayDepth(void)
 // user and home routines
 //------------------------------------------------------------------------
 
-char* wxGetHomeDir( char *dest )
+const char* wxGetHomeDir( wxString *home  )
 {
-  wxString tmp = wxGetUserHome( wxString() );
-  if (tmp.IsNull())
-    strcpy( wxBuffer, "/" );
-  else
-    strcpy( wxBuffer, tmp );
-  if (dest) strcpy( dest, WXSTRINGCAST tmp );
-  return wxBuffer;
+  *home = wxGetUserHome( wxString() );
+  if (home->IsNull()) *home = "/";
+  return *home;
 };
 
 char *wxGetUserHome( const wxString &user )
@@ -202,162 +199,6 @@ bool wxDirExists( const wxString& dir )
   return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
 };
 
-//------------------------------------------------------------------------
-// wild character routines
-//------------------------------------------------------------------------
-
-bool wxIsWild( const wxString& pattern )
-{
-  wxString tmp = pattern;
-  char *pat = WXSTRINGCAST(tmp);
-    while (*pat) {
-	switch (*pat++) {
-	case '?': case '*': case '[': case '{':
-	    return TRUE;
-	case '\\':
-	    if (!*pat++)
-		return FALSE;
-	}
-    }
-    return FALSE;
-};
-
-
-bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
-{
-  wxString tmp1 = pat;
-  char *pattern = WXSTRINGCAST(tmp1);
-  wxString tmp2 = text;
-  char *str = WXSTRINGCAST(tmp2);
-    char c;
-    char *cp;
-    bool done = FALSE, ret_code, ok;
-    // Below is for vi fans
-    const char OB = '{', CB = '}';
-
-    // dot_special means '.' only matches '.'
-    if (dot_special && *str == '.' && *pattern != *str)
-	return FALSE;
-
-    while ((*pattern != '\0') && (!done)
-    && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
-	switch (*pattern) {
-	case '\\':
-	    pattern++;
-	    if (*pattern != '\0')
-		pattern++;
-	    break;
-	case '*':
-	    pattern++;
-	    ret_code = FALSE;
-	    while ((*str!='\0')
-	    && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
-		/*loop*/;
-	    if (ret_code) {
-		while (*str != '\0')
-		    str++;
-		while (*pattern != '\0')
-		    pattern++;
-	    }
-	    break;
-	case '[':
-	    pattern++;
-	  repeat:
-	    if ((*pattern == '\0') || (*pattern == ']')) {
-		done = TRUE;
-		break;
-	    }
-	    if (*pattern == '\\') {
-		pattern++;
-		if (*pattern == '\0') {
-		    done = TRUE;
-		    break;
-		}
-	    }
-	    if (*(pattern + 1) == '-') {
-		c = *pattern;
-		pattern += 2;
-		if (*pattern == ']') {
-		    done = TRUE;
-		    break;
-		}
-		if (*pattern == '\\') {
-		    pattern++;
-		    if (*pattern == '\0') {
-			done = TRUE;
-			break;
-		    }
-		}
-		if ((*str < c) || (*str > *pattern)) {
-		    pattern++;
-		    goto repeat;
-		}
-	    } else if (*pattern != *str) {
-		pattern++;
-		goto repeat;
-	    }
-	    pattern++;
-	    while ((*pattern != ']') && (*pattern != '\0')) {
-		if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
-		    pattern++;
-		pattern++;
-	    }
-	    if (*pattern != '\0') {
-		pattern++, str++;
-	    }
-	    break;
-	case '?':
-	    pattern++;
-	    str++;
-	    break;
-	case OB:
-	    pattern++;
-	    while ((*pattern != CB) && (*pattern != '\0')) {
-		cp = str;
-		ok = TRUE;
-		while (ok && (*cp != '\0') && (*pattern != '\0')
-		&&  (*pattern != ',') && (*pattern != CB)) {
-		    if (*pattern == '\\')
-			pattern++;
-		    ok = (*pattern++ == *cp++);
-		}
-		if (*pattern == '\0') {
-		    ok = FALSE;
-		    done = TRUE;
-		    break;
-		} else if (ok) {
-		    str = cp;
-		    while ((*pattern != CB) && (*pattern != '\0')) {
-			if (*++pattern == '\\') {
-			    if (*++pattern == CB)
-				pattern++;
-			}
-		    }
-		} else {
-		    while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
-			if (*++pattern == '\\') {
-                            if (*++pattern == CB || *pattern == ',')
-				pattern++;
-			}
-		    }
-		}
-		if (*pattern != '\0')
-		    pattern++;
-	    }
-	    break;
-	default:
-	    if (*str == *pattern) {
-		str++, pattern++;
-	    } else {
-		done = TRUE;
-	    }
-	}
-    }
-    while (*pattern == '*')
-	pattern++;
-    return ((*str == '\0') && (*pattern == '\0'));
-};
-
 //------------------------------------------------------------------------
 // subprocess routines
 //------------------------------------------------------------------------