X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19b726bbca63289d69d013e65d6b26e8b641718d..239eaa415414c5d978072af89772b12e74309e1d:/src/common/utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 6020b8780d..fdda0694d9 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utilscmn.cpp
+// Name:        src/common/utilscmn.cpp
 // Purpose:     Miscellaneous utility functions and classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "utils.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -29,7 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
+    #include "wx/app.h"
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
@@ -37,10 +33,11 @@
 
     #if wxUSE_GUI
         #include "wx/window.h"
-        #include "wx/menu.h"
         #include "wx/frame.h"
+        #include "wx/menu.h"
         #include "wx/msgdlg.h"
         #include "wx/textdlg.h"
+        #include "wx/textctrl.h"    // for wxTE_PASSWORD
         #if wxUSE_ACCEL
             #include "wx/menuitem.h"
             #include "wx/accel.h"
@@ -48,9 +45,16 @@
     #endif // wxUSE_GUI
 #endif // WX_PRECOMP
 
-#ifndef __WIN16__
+#include "wx/apptrait.h"
+
 #include "wx/process.h"
 #include "wx/txtstrm.h"
+#include "wx/uri.h"
+#include "wx/mimetype.h"
+#include "wx/config.h"
+
+#if defined(__WXWINCE__) && wxUSE_DATETIME
+#include "wx/datetime.h"
 #endif
 
 #include <ctype.h>
@@ -58,7 +62,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(__WATCOMC__)
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)
     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif
@@ -66,280 +70,165 @@
 
 #if wxUSE_GUI
     #include "wx/colordlg.h"
+    #include "wx/fontdlg.h"
     #include "wx/notebook.h"
     #include "wx/frame.h"
     #include "wx/statusbr.h"
-    #include "wx/toolbar.h"
 #endif // wxUSE_GUI
 
+#ifndef __WXWINCE__
 #include <time.h>
+#else
+#include "wx/msw/wince/time.h"
+#endif
 
-#ifndef __MWERKS__
-    #include <sys/types.h>
-    #include <sys/stat.h>
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include "InternetConfig.h"
+#endif
 #endif
 
-#ifdef __SALFORDC__
-    #include <clib.h>
+#if !defined(__MWERKS__) && !defined(__WXWINCE__)
+    #include <sys/types.h>
+    #include <sys/stat.h>
 #endif
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
     #include "wx/msw/private.h"
+    #include "wx/msw/registry.h"
 #endif
 
+#if wxUSE_BASE
+
 // ----------------------------------------------------------------------------
-// function protoypes
+// common data
 // ----------------------------------------------------------------------------
 
-#if wxUSE_GUI
-    static wxWindow *wxFindWindowByLabel1(const wxString& title, wxWindow *parent);
-    static wxWindow *wxFindWindowByName1 (const wxString& title, wxWindow *parent);
-#endif // wxUSE_GUI
-
 // ============================================================================
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// string functions
-// ----------------------------------------------------------------------------
-
-#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 // wxMAC
-
-#if defined( __VMS__ ) && ( __VMS_VER < 70000000 )
-// we have no strI functions under VMS, therefore I have implemented
-// an inefficient but portable version: convert copies of strings to lowercase
-// and then use the normal comparison
-static void myLowerString(char *s)
-{
-  while(*s){
-    if(isalpha(*s)) *s = (char)tolower(*s);
-    s++;
-  }
-}
-
-int strcasecmp(const char *str_1, const char *str_2)
-{
-  char *temp1 = new char[strlen(str_1)+1];
-  char *temp2 = new char[strlen(str_2)+1];
-  strcpy(temp1,str_1);
-  strcpy(temp2,str_2);
-  myLowerString(temp1);
-  myLowerString(temp2);
-
-  int result = wxStrcmp(temp1,temp2);
-  delete[] temp1;
-  delete[] temp2;
-
-  return(result);
-}
-
-int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
-{
-  char *temp1 = new char[strlen(str_1)+1];
-  char *temp2 = new char[strlen(str_2)+1];
-  strcpy(temp1,str_1);
-  strcpy(temp2,str_2);
-  myLowerString(temp1);
-  myLowerString(temp2);
-
-  int result = strncmp(temp1,temp2,maxchar);
-  delete[] temp1;
-  delete[] temp2;
-
-  return(result);
-}
-#endif // __VMS__
-
-#ifdef __WINDOWS__
-
-#ifndef __GNUWIN32__
-#ifndef __MWERKS__
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-#else
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-#endif
-#endif
-
-#else
-
-#ifdef __EMX__
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-#endif
-
-// This declaration is missing in SunOS!
-// (Yes, I know it is NOT ANSI-C but its in BSD libc)
-#if defined(__xlC) || defined(__AIX__) || defined(__GNUG__)
-extern "C"
-{
-  int strcasecmp (const char *, const char *);
-  int strncasecmp (const char *, const char *, size_t);
-}
-#endif
-#endif  /* __WXMSW__ */
-
-#ifdef __WXPM__
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-#endif
+#if WXWIN_COMPATIBILITY_2_4
 
 wxChar *
 copystring (const wxChar *s)
 {
-  if (s == NULL) s = wxT("");
-  size_t len = wxStrlen (s) + 1;
+    if (s == NULL) s = wxEmptyString;
+    size_t len = wxStrlen (s) + 1;
 
-  wxChar *news = new wxChar[len];
-  memcpy (news, s, len * sizeof(wxChar));    // Should be the fastest
+    wxChar *news = new wxChar[len];
+    memcpy (news, s, len * sizeof(wxChar));    // Should be the fastest
 
-  return news;
+    return news;
 }
 
-// Id generation
-static long wxCurrentId = 100;
+#endif // WXWIN_COMPATIBILITY_2_4
 
-long
-wxNewId (void)
-{
-  return wxCurrentId++;
-}
+// ----------------------------------------------------------------------------
+// String <-> Number conversions (deprecated)
+// ----------------------------------------------------------------------------
 
-long
-wxGetCurrentId(void) { return wxCurrentId; }
+#if WXWIN_COMPATIBILITY_2_4
 
-void
-wxRegisterId (long id)
-{
-  if (id >= wxCurrentId)
-    wxCurrentId = id + 1;
-}
+WXDLLIMPEXP_DATA_BASE(const wxChar *) wxFloatToStringStr = wxT("%.2f");
+WXDLLIMPEXP_DATA_BASE(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
 
 void
-StringToFloat (wxChar *s, float *number)
+StringToFloat (const wxChar *s, float *number)
 {
-  if (s && *s && number)
-    *number = (float) wxStrtod (s, (wxChar **) NULL);
+    if (s && *s && number)
+        *number = (float) wxStrtod (s, (wxChar **) NULL);
 }
 
 void
-StringToDouble (wxChar *s, double *number)
+StringToDouble (const wxChar *s, double *number)
 {
-  if (s && *s && number)
-    *number = wxStrtod (s, (wxChar **) NULL);
+    if (s && *s && number)
+        *number = wxStrtod (s, (wxChar **) NULL);
 }
 
 wxChar *
 FloatToString (float number, const wxChar *fmt)
 {
-  static wxChar buf[256];
+    static wxChar buf[256];
 
-//  sprintf (buf, "%.2f", number);
-  wxSprintf (buf, fmt, number);
-  return buf;
+    wxSprintf (buf, fmt, number);
+    return buf;
 }
 
 wxChar *
 DoubleToString (double number, const wxChar *fmt)
 {
-  static wxChar buf[256];
+    static wxChar buf[256];
 
-  wxSprintf (buf, fmt, number);
-  return buf;
+    wxSprintf (buf, fmt, number);
+    return buf;
 }
 
 void
-StringToInt (wxChar *s, int *number)
+StringToInt (const wxChar *s, int *number)
 {
-  if (s && *s && number)
-    *number = (int) wxStrtol (s, (wxChar **) NULL, 10);
+    if (s && *s && number)
+        *number = (int) wxStrtol (s, (wxChar **) NULL, 10);
 }
 
 void
-StringToLong (wxChar *s, long *number)
+StringToLong (const wxChar *s, long *number)
 {
-  if (s && *s && number)
-    *number = wxStrtol (s, (wxChar **) NULL, 10);
+    if (s && *s && number)
+        *number = wxStrtol (s, (wxChar **) NULL, 10);
 }
 
 wxChar *
 IntToString (int number)
 {
-  static wxChar buf[20];
+    static wxChar buf[20];
 
-  wxSprintf (buf, wxT("%d"), number);
-  return buf;
+    wxSprintf (buf, wxT("%d"), number);
+    return buf;
 }
 
 wxChar *
 LongToString (long number)
 {
-  static wxChar buf[20];
+    static wxChar buf[20];
 
-  wxSprintf (buf, wxT("%ld"), number);
-  return buf;
+    wxSprintf (buf, wxT("%ld"), number);
+    return buf;
 }
 
+#endif // WXWIN_COMPATIBILITY_2_4
+
 // Array used in DecToHex conversion routine.
 static wxChar hexArray[] = wxT("0123456789ABCDEF");
 
 // Convert 2-digit hex number to decimal
 int wxHexToDec(const wxString& buf)
 {
-  int firstDigit, secondDigit;
+    int firstDigit, secondDigit;
 
-  if (buf.GetChar(0) >= wxT('A'))
-    firstDigit = buf.GetChar(0) - wxT('A') + 10;
-  else
-    firstDigit = buf.GetChar(0) - wxT('0');
+    if (buf.GetChar(0) >= wxT('A'))
+        firstDigit = buf.GetChar(0) - wxT('A') + 10;
+    else
+       firstDigit = buf.GetChar(0) - wxT('0');
 
-  if (buf.GetChar(1) >= wxT('A'))
-    secondDigit = buf.GetChar(1) - wxT('A') + 10;
-  else
-    secondDigit = buf.GetChar(1) - wxT('0');
+    if (buf.GetChar(1) >= wxT('A'))
+        secondDigit = buf.GetChar(1) - wxT('A') + 10;
+    else
+        secondDigit = buf.GetChar(1) - wxT('0');
 
-  return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
+    return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
 }
 
 // Convert decimal integer to 2-character hex string
 void wxDecToHex(int dec, wxChar *buf)
 {
-  int firstDigit = (int)(dec/16.0);
-  int secondDigit = (int)(dec - (firstDigit*16.0));
-  buf[0] = hexArray[firstDigit];
-  buf[1] = hexArray[secondDigit];
-  buf[2] = 0;
+    int firstDigit = (int)(dec/16.0);
+    int secondDigit = (int)(dec - (firstDigit*16.0));
+    buf[0] = hexArray[firstDigit];
+    buf[1] = hexArray[secondDigit];
+    buf[2] = 0;
 }
 
 // Convert decimal integer to 2-character hex string
@@ -350,325 +239,595 @@ wxString wxDecToHex(int dec)
     return wxString(buf);
 }
 
-// Match a string INDEPENDENT OF CASE
-bool
-StringMatch (char *str1, char *str2, bool subString, bool exact)
+// ----------------------------------------------------------------------------
+// misc functions
+// ----------------------------------------------------------------------------
+
+// Return the current date/time
+wxString wxNow()
 {
-  if (str1 == NULL || str2 == NULL)
-    return FALSE;
-  if (str1 == str2)
-    return TRUE;
+#ifdef __WXWINCE__
+#if wxUSE_DATETIME
+    wxDateTime now = wxDateTime::Now();
+    return now.Format();
+#else
+    return wxEmptyString;
+#endif
+#else
+    time_t now = time((time_t *) NULL);
+    char *date = ctime(&now);
+    date[24] = '\0';
+    return wxString::FromAscii(date);
+#endif
+}
 
-  if (subString)
-    {
-      int len1 = strlen (str1);
-      int len2 = strlen (str2);
-      int i;
+void wxUsleep(unsigned long milliseconds)
+{
+    wxMilliSleep(milliseconds);
+}
 
-      // Search for str1 in str2
-      // Slow .... but acceptable for short strings
-      for (i = 0; i <= len2 - len1; i++)
-        {
-          if (strncasecmp (str1, str2 + i, len1) == 0)
-            return TRUE;
-        }
-    }
-  else if (exact)
-    {
-      if (strcasecmp (str1, str2) == 0)
-        return TRUE;
-    }
-  else
-    {
-      int len1 = strlen (str1);
-      int len2 = strlen (str2);
+const wxChar *wxGetInstallPrefix()
+{
+    wxString prefix;
 
-      if (strncasecmp (str1, str2, wxMin (len1, len2)) == 0)
-        return TRUE;
-    }
+    if ( wxGetEnv(wxT("WXPREFIX"), &prefix) )
+        return prefix.c_str();
 
-  return FALSE;
+#ifdef wxINSTALL_PREFIX
+    return wxT(wxINSTALL_PREFIX);
+#else
+    return wxEmptyString;
+#endif
 }
 
-// Return the current date/time
-// [volatile]
-wxString wxNow()
+wxString wxGetDataDir()
 {
-  time_t now = time((time_t *) NULL);
-  char *date = ctime(&now);
-  date[24] = '\0';
-  return wxString(date);
+    wxString dir = wxGetInstallPrefix();
+    dir <<  wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx");
+    return dir;
 }
 
-#if wxUSE_GUI
+int wxGetOsVersion(int *verMaj, int *verMin)
+{
+    // we want this function to work even if there is no wxApp
+    wxConsoleAppTraits traitsConsole;
+    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    if ( ! traits )
+        traits = &traitsConsole;
+
+    wxToolkitInfo& info = traits->GetToolkitInfo();
+    if ( verMaj )
+        *verMaj = info.versionMajor;
+    if ( verMin )
+        *verMin = info.versionMinor;
+    return info.os;
+}
 
 // ----------------------------------------------------------------------------
-// Menu accelerators related functions
+// network and user id functions
 // ----------------------------------------------------------------------------
 
-wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
+// Get Full RFC822 style email address
+bool wxGetEmailAddress(wxChar *address, int maxSize)
 {
-  if (!in)
-    return (wxChar *) NULL;
+    wxString email = wxGetEmailAddress();
+    if ( !email )
+        return false;
+
+    wxStrncpy(address, email, maxSize - 1);
+    address[maxSize - 1] = wxT('\0');
 
-  if (!out)
-    out = copystring(in);
+    return true;
+}
 
-  wxChar *tmpOut = out;
+wxString wxGetEmailAddress()
+{
+    wxString email;
 
-  while (*in)
+    wxString host = wxGetFullHostName();
+    if ( !host.empty() )
     {
-      if (*in == wxT('&'))
-        {
-          // Check && -> &, &x -> x
-          if (*++in == wxT('&'))
-            *out++ = *in++;
-        }
-      else if (*in == wxT('\t'))
+        wxString user = wxGetUserId();
+        if ( !user.empty() )
         {
-          // Remove all stuff after \t in X mode, and let the stuff as is
-          // in Windows mode.
-          // Accelerators are handled in wx_item.cc for Motif, and are not
-          // YET supported in XView
-          break;
+            email << user << wxT('@') << host;
         }
-      else
-        *out++ = *in++;
-    }                                // while
-
-  *out = wxT('\0');
+    }
 
-  return tmpOut;
+    return email;
 }
 
-wxString wxStripMenuCodes(const wxString& str)
+wxString wxGetUserId()
 {
-    wxChar *buf = new wxChar[str.Length() + 1];
-    wxStripMenuCodes(WXSTRINGCAST str, buf);
-    wxString str1(buf);
-    delete[] buf;
-    return str1;
-}
+    static const int maxLoginLen = 256; // FIXME arbitrary number
+
+    wxString buf;
+    bool ok = wxGetUserId(wxStringBuffer(buf, maxLoginLen), maxLoginLen);
+
+    if ( !ok )
+        buf.Empty();
 
-#if wxUSE_ACCEL
+    return buf;
+}
 
-// return wxAcceleratorEntry for the given menu string or NULL if none
-// specified
-wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
+wxString wxGetUserName()
 {
-    // check for accelerators: they are given after '\t'
-    int posTab = label.Find(wxT('\t'));
-    if ( posTab != wxNOT_FOUND ) {
-        // parse the accelerator string
-        int keyCode = 0;
-        int accelFlags = wxACCEL_NORMAL;
-        wxString current;
-        for ( size_t n = (size_t)posTab + 1; n < label.Len(); n++ ) {
-            if ( (label[n] == '+') || (label[n] == '-') ) {
-                if ( current == _("ctrl") )
-                    accelFlags |= wxACCEL_CTRL;
-                else if ( current == _("alt") )
-                    accelFlags |= wxACCEL_ALT;
-                else if ( current == _("shift") )
-                    accelFlags |= wxACCEL_SHIFT;
-                else {
-                    wxLogDebug(wxT("Unknown accel modifier: '%s'"),
-                               current.c_str());
-                }
+    static const int maxUserNameLen = 1024; // FIXME arbitrary number
 
-                current.Empty();
-            }
-            else {
-                current += wxTolower(label[n]);
-            }
-        }
+    wxString buf;
+    bool ok = wxGetUserName(wxStringBuffer(buf, maxUserNameLen), maxUserNameLen);
 
-        if ( current.IsEmpty() ) {
-            wxLogDebug(wxT("No accel key found, accel string ignored."));
-        }
-        else {
-            if ( current.Len() == 1 ) {
-                // it's a letter
-                keyCode = wxToupper(current[0U]);
-            }
-            else {
-                // is it a function key?
-                if ( current[0U] == 'f' && isdigit(current[1U]) &&
-                     (current.Len() == 2 ||
-                     (current.Len() == 3 && isdigit(current[2U]))) ) {
-                    int n;
-                    wxSscanf(current.c_str() + 1, wxT("%d"), &n);
-
-                    keyCode = WXK_F1 + n - 1;
-                }
-                else {
-                    // several special cases
-                    current.MakeUpper();
-                    if ( current == _("DEL") ) {
-                        keyCode = WXK_DELETE;
-                    }
-                    else if ( current == _("DELETE") ) {
-                        keyCode = WXK_DELETE;
-                    }
-                    else if ( current == _("INS") ) {
-                        keyCode = WXK_INSERT;
-                    }
-                    else if ( current == _("INSERT") ) {
-                        keyCode = WXK_INSERT;
-                    }
-#if 0
-                    else if ( current == _("PGUP") ) {
-                        keyCode = VK_PRIOR;
-                    }
-                    else if ( current == _("PGDN") ) {
-                        keyCode = VK_NEXT;
-                    }
-#endif
-                    else
-                    {
-                        wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
-                                   current.c_str());
-                    }
-                }
-            }
-        }
+    if ( !ok )
+        buf.Empty();
 
-        if ( keyCode ) {
-            // we do have something
-            return new wxAcceleratorEntry(accelFlags, keyCode);
-        }
-    }
+    return buf;
+}
+
+wxString wxGetHostName()
+{
+    static const size_t hostnameSize = 257;
+
+    wxString buf;
+    bool ok = wxGetHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);
+
+    if ( !ok )
+        buf.Empty();
 
-    return (wxAcceleratorEntry *)NULL;
+    return buf;
 }
 
-#endif // wxUSE_ACCEL
+wxString wxGetFullHostName()
+{
+    static const size_t hostnameSize = 257;
 
-// ----------------------------------------------------------------------------
-// Window search functions
-// ----------------------------------------------------------------------------
+    wxString buf;
+    bool ok = wxGetFullHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);
 
-/*
- * If parent is non-NULL, look through children for a label or title
- * matching the specified string. If NULL, look through all top-level windows.
- *
- */
+    if ( !ok )
+        buf.Empty();
 
-wxWindow *
-wxFindWindowByLabel (const wxString& title, wxWindow * parent)
+    return buf;
+}
+
+wxString wxGetHomeDir()
 {
-    if (parent)
-    {
-        return wxFindWindowByLabel1(title, parent);
-    }
-    else
-    {
-        for ( wxWindowList::Node * node = wxTopLevelWindows.GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxWindow *win = node->GetData();
-            wxWindow *retwin = wxFindWindowByLabel1 (title, win);
-            if (retwin)
-                return retwin;
-        }                        // for()
+    wxString home;
+    wxGetHomeDir(&home);
 
-    }
-    return (wxWindow *) NULL;
+    return home;
 }
 
-// Recursive
-static wxWindow *
-wxFindWindowByLabel1 (const wxString& title, wxWindow * parent)
+#if 0
+
+wxString wxGetCurrentDir()
 {
-    if (parent)
+    wxString dir;
+    size_t len = 1024;
+    bool ok;
+    do
     {
-        if (parent->GetLabel() == title)
-            return parent;
-    }
+        ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL;
+        dir.UngetWriteBuf();
 
-    if (parent)
-    {
-        for ( wxWindowList::Node * node = parent->GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
+        if ( !ok )
         {
-            wxWindow *win = (wxWindow *)node->GetData();
-            wxWindow *retwin = wxFindWindowByLabel1 (title, win);
-            if (retwin)
-                return retwin;
-        }
+            if ( errno != ERANGE )
+            {
+                wxLogSysError(_T("Failed to get current directory"));
 
-    }
+                return wxEmptyString;
+            }
+            else
+            {
+                // buffer was too small, retry with a larger one
+                len *= 2;
+            }
+        }
+        //else: ok
+    } while ( !ok );
 
-    return (wxWindow *) NULL;                        // Not found
+    return dir;
 }
 
-/*
- * If parent is non-NULL, look through children for a name
- * matching the specified string. If NULL, look through all top-level windows.
- *
- */
+#endif // 0
 
-wxWindow *
-wxFindWindowByName (const wxString& title, wxWindow * parent)
+// ----------------------------------------------------------------------------
+// wxExecute
+// ----------------------------------------------------------------------------
+
+// wxDoExecuteWithCapture() helper: reads an entire stream into one array
+//
+// returns true if ok, false if error
+#if wxUSE_STREAMS
+static bool ReadAll(wxInputStream *is, wxArrayString& output)
 {
-    if (parent)
-    {
-        return wxFindWindowByName1 (title, parent);
-    }
-    else
-    {
-        for ( wxWindowList::Node * node = wxTopLevelWindows.GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxWindow *win = node->GetData();
-            wxWindow *retwin = wxFindWindowByName1 (title, win);
-            if (retwin)
-                return retwin;
-        }
+    wxCHECK_MSG( is, false, _T("NULL stream in wxExecute()?") );
 
-    }
+    // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
+    is->Reset();
 
-    // Failed? Try by label instead.
-    return wxFindWindowByLabel(title, parent);
-}
+    wxTextInputStream tis(*is);
 
-// Recursive
-static wxWindow *
-wxFindWindowByName1 (const wxString& title, wxWindow * parent)
-{
-  if (parent)
+    bool cont = true;
+    while ( cont )
     {
-            if ( parent->GetName() == title )
-                        return parent;
-    }
+        wxString line = tis.ReadLine();
+        if ( is->Eof() )
+            break;
 
-  if (parent)
-    {
-      for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())
+        if ( !*is )
         {
-          wxWindow *win = (wxWindow *) node->Data ();
-          wxWindow *retwin = wxFindWindowByName1 (title, win);
-          if (retwin)
-            return retwin;
-        }                        // for()
-
+            cont = false;
+        }
+        else
+        {
+            output.Add(line);
+        }
     }
 
-  return (wxWindow *) NULL;                        // Not found
+    return cont;
+}
+#endif // wxUSE_STREAMS
+
+// this is a private function because it hasn't a clean interface: the first
+// array is passed by reference, the second by pointer - instead we have 2
+// public versions of wxExecute() below
+static long wxDoExecuteWithCapture(const wxString& command,
+                                   wxArrayString& output,
+                                   wxArrayString* error,
+                                   int flags)
+{
+    // create a wxProcess which will capture the output
+    wxProcess *process = new wxProcess;
+    process->Redirect();
+
+    long rc = wxExecute(command, wxEXEC_SYNC | flags, process);
+
+#if wxUSE_STREAMS
+    if ( rc != -1 )
+    {
+        if ( !ReadAll(process->GetInputStream(), output) )
+            rc = -1;
+
+        if ( error )
+        {
+            if ( !ReadAll(process->GetErrorStream(), *error) )
+                rc = -1;
+        }
+
+    }
+#else
+    wxUnusedVar(output);
+    wxUnusedVar(error);
+#endif // wxUSE_STREAMS/!wxUSE_STREAMS
+
+    delete process;
+
+    return rc;
+}
+
+long wxExecute(const wxString& command, wxArrayString& output, int flags)
+{
+    return wxDoExecuteWithCapture(command, output, NULL, flags);
+}
+
+long wxExecute(const wxString& command,
+               wxArrayString& output,
+               wxArrayString& error,
+               int flags)
+{
+    return wxDoExecuteWithCapture(command, output, &error, flags);
+}
+
+// ----------------------------------------------------------------------------
+// Launch default browser
+// ----------------------------------------------------------------------------
+
+bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
+{
+    wxUnusedVar(flags);
+
+    // set the scheme of url to http if it does not have one
+    wxString url(urlOrig);
+    if ( !wxURI(url).HasScheme() )
+        url.Prepend(wxT("http://"));
+
+#if defined(__WXMSW__)
+
+#if wxUSE_IPC
+    if ( flags & wxBROWSER_NEW_WINDOW )
+    {
+        // ShellExecuteEx() opens the URL in an existing window by default so
+        // we can't use it if we need a new window
+        wxRegKey key(wxRegKey::HKCR, url.BeforeFirst(':') + _T("\\shell\\open"));
+        if ( key.Exists() )
+        {
+            wxRegKey keyDDE(key, wxT("DDEExec"));
+            if ( keyDDE.Exists() )
+            {
+                const wxString ddeTopic = wxRegKey(keyDDE, wxT("topic"));
+
+                // we only know the syntax of WWW_OpenURL DDE request for IE,
+                // optimistically assume that all other browsers are compatible
+                // with it
+                wxString ddeCmd;
+                bool ok = ddeTopic == wxT("WWW_OpenURL");
+                if ( ok )
+                {
+                    ddeCmd = keyDDE.QueryDefaultValue();
+                    ok = !ddeCmd.empty();
+                }
+
+                if ( ok )
+                {
+                    // for WWW_OpenURL, the index of the window to open the URL
+                    // in is -1 (meaning "current") by default, replace it with
+                    // 0 which means "new" (see KB article 160957)
+                    ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
+                                        false /* only first occurence */) == 1;
+                }
+
+                if ( ok )
+                {
+                    // and also replace the parameters: the topic should
+                    // contain a placeholder for the URL
+                    ok = ddeCmd.Replace(wxT("%1"), url, false) == 1;
+                }
+
+                if ( ok )
+                {
+                    // try to send it the DDE request now but ignore the errors
+                    wxLogNull noLog;
+
+                    const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
+                    if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCmd) )
+                        return true;
+
+                    // this is not necessarily an error: maybe browser is
+                    // simply not running, but no matter, in any case we're
+                    // going to launch it using ShellExecuteEx() below now and
+                    // we shouldn't try to open a new window if we open a new
+                    // browser anyhow
+                }
+            }
+        }
+    }
+#endif // wxUSE_IPC
+
+    WinStruct<SHELLEXECUTEINFO> sei;
+    sei.lpFile = url.c_str();
+    sei.lpVerb = _T("open");
+    sei.nShow = SW_SHOWNORMAL;
+
+    ::ShellExecuteEx(&sei);
+
+    const int nResult = (int) sei.hInstApp;
+
+    // Firefox returns file not found for some reason, so make an exception
+    // for it
+    if ( nResult > 32 || nResult == SE_ERR_FNF )
+    {
+#ifdef __WXDEBUG__
+        // Log something if SE_ERR_FNF happens
+        if ( nResult == SE_ERR_FNF )
+            wxLogDebug(wxT("SE_ERR_FNF from ShellExecute -- maybe FireFox?"));
+#endif // __WXDEBUG__
+        return true;
+    }
+#elif defined(__WXMAC__)
+    OSStatus err;
+    ICInstance inst;
+    SInt32 startSel;
+    SInt32 endSel;
+
+    err = ICStart(&inst, 'STKA'); // put your app creator code here
+    if (err == noErr)
+    {
+#if !TARGET_CARBON
+        err = ICFindConfigFile(inst, 0, NULL);
+#endif
+        if (err == noErr)
+        {
+            ConstStr255Param hint = 0;
+            startSel = 0;
+            endSel = url.Length();
+            err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
+            if (err != noErr)
+                wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);
+        }
+        ICStop(inst);
+        return true;
+    }
+    else
+    {
+        wxLogDebug(wxT("ICStart error %d"), (int) err);
+        return false;
+    }
+#elif wxUSE_MIMETYPE
+    // Non-windows way
+    bool ok = false;
+    wxString cmd;
+
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("html"));
+    if ( ft )
+    {
+        wxString mt;
+        ft->GetMimeType(&mt);
+
+        ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(url));
+        delete ft;
+    }
+
+    if ( !ok || cmd.empty() )
+    {
+        // fallback to checking for the BROWSER environment variable
+        cmd = wxGetenv(wxT("BROWSER"));
+        if ( !cmd.empty() )
+            cmd << _T(' ') << url;
+    }
+
+    ok = ( !cmd.empty() && wxExecute(cmd) );
+    if (ok)
+        return ok;
+
+    // no file type for HTML extension
+    wxLogError(_T("No default application configured for HTML files."));
+
+#endif // !wxUSE_MIMETYPE && !__WXMSW__
 
+    wxLogSysError(_T("Failed to open URL \"%s\" in default browser."),
+                  url.c_str());
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// wxApp::Yield() wrappers for backwards compatibility
+// ----------------------------------------------------------------------------
+
+bool wxYield()
+{
+    return wxTheApp && wxTheApp->Yield();
+}
+
+bool wxYieldIfNeeded()
+{
+    return wxTheApp && wxTheApp->Yield(true);
+}
+
+#endif // wxUSE_BASE
+
+// ============================================================================
+// GUI-only functions from now on
+// ============================================================================
+
+#if wxUSE_GUI
+
+// Id generation
+static long wxCurrentId = 100;
+
+long wxNewId()
+{
+    // skip the part of IDs space that contains hard-coded values:
+    if (wxCurrentId == wxID_LOWEST)
+        wxCurrentId = wxID_HIGHEST + 1;
+
+    return wxCurrentId++;
 }
 
-// Returns menu item id or -1 if none.
+long
+wxGetCurrentId(void) { return wxCurrentId; }
+
+void
+wxRegisterId (long id)
+{
+  if (id >= wxCurrentId)
+    wxCurrentId = id + 1;
+}
+
+#if wxUSE_MENUS
+
+// ----------------------------------------------------------------------------
+// Menu accelerators related functions
+// ----------------------------------------------------------------------------
+
+wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
+{
+    wxString s = wxMenuItem::GetLabelFromText(in);
+    if ( out )
+    {
+        // go smash their buffer if it's not big enough - I love char * params
+        memcpy(out, s.c_str(), s.length() * sizeof(wxChar));
+    }
+    else
+    {
+        // MYcopystring - for easier search...
+        out = new wxChar[s.length() + 1];
+        wxStrcpy(out, s.c_str());
+    }
+
+    return out;
+}
+
+wxString wxStripMenuCodes(const wxString& in)
+{
+    wxString out;
+
+    size_t len = in.length();
+    out.reserve(len);
+
+    for ( size_t n = 0; n < len; n++ )
+    {
+        wxChar ch = in[n];
+        if ( ch == _T('&') )
+        {
+            // skip it, it is used to introduce the accel char (or to quote
+            // itself in which case it should still be skipped): note that it
+            // can't be the last character of the string
+            if ( ++n == len )
+            {
+                wxLogDebug(_T("Invalid menu string '%s'"), in.c_str());
+            }
+            else
+            {
+                // use the next char instead
+                ch = in[n];
+            }
+        }
+        else if ( ch == _T('\t') )
+        {
+            // everything after TAB is accel string, exit the loop
+            break;
+        }
+
+        out += ch;
+    }
+
+    return out;
+}
+
+#endif // wxUSE_MENUS
+
+// ----------------------------------------------------------------------------
+// Window search functions
+// ----------------------------------------------------------------------------
+
+/*
+ * If parent is non-NULL, look through children for a label or title
+ * matching the specified string. If NULL, look through all top-level windows.
+ *
+ */
+
+wxWindow *
+wxFindWindowByLabel (const wxString& title, wxWindow * parent)
+{
+    return wxWindow::FindWindowByLabel( title, parent );
+}
+
+
+/*
+ * If parent is non-NULL, look through children for a name
+ * matching the specified string. If NULL, look through all top-level windows.
+ *
+ */
+
+wxWindow *
+wxFindWindowByName (const wxString& name, wxWindow * parent)
+{
+    return wxWindow::FindWindowByName( name, parent );
+}
+
+// Returns menu item id or wxNOT_FOUND if none.
 int
 wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
 {
+#if wxUSE_MENUS
   wxMenuBar *menuBar = frame->GetMenuBar ();
-  if (!menuBar)
-    return -1;
-  return menuBar->FindMenuItem (menuString, itemString);
+  if ( menuBar )
+      return menuBar->FindMenuItem (menuString, itemString);
+#endif // wxUSE_MENUS
+
+  return wxNOT_FOUND;
 }
 
 // Try to find the deepest child that contains 'pt'.
@@ -683,6 +842,7 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
 
     // Hack for wxNotebook case: at least in wxGTK, all pages
     // claim to be shown, so we must only deal with the selected one.
+#if wxUSE_NOTEBOOK
     if (win->IsKindOf(CLASSINFO(wxNotebook)))
     {
       wxNotebook* nb = (wxNotebook*) win;
@@ -695,38 +855,16 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
            return foundWin;
       }
     }
-    /* Doesn't work
-    // Frame case
-    else if (win->IsKindOf(CLASSINFO(wxFrame)))
-    {
-      // Pseudo-children that may not be mentioned in the child list
-      wxWindowList extraChildren;
-      wxFrame* frame = (wxFrame*) win;
-      if (frame->GetStatusBar())
-        extraChildren.Append(frame->GetStatusBar());
-      if (frame->GetToolBar())
-        extraChildren.Append(frame->GetToolBar());
-
-      wxNode* node = extraChildren.First();
-      while (node)
-      {
-          wxWindow* child = (wxWindow*) node->Data();
-          wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
-          if (foundWin)
-            return foundWin;
-          node = node->Next();
-      }
-    }
-    */
+#endif
 
-    wxNode* node = win->GetChildren().Last();
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetLast();
     while (node)
     {
-        wxWindow* child = (wxWindow*) node->Data();
+        wxWindow* child = node->GetData();
         wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
         if (foundWin)
           return foundWin;
-        node = node->Previous();
+        node = node->GetPrevious();
     }
 
     wxPoint pos = win->GetPosition();
@@ -748,215 +886,18 @@ wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt)
     // Go backwards through the list since windows
     // on top are likely to have been appended most
     // recently.
-    wxNode* node = wxTopLevelWindows.Last();
+    wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetLast();
     while (node)
     {
-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();
         wxWindow* found = wxFindWindowAtPoint(win, pt);
         if (found)
             return found;
-        node = node->Previous();
+        node = node->GetPrevious();
     }
     return NULL;
 }
 
-#endif // wxUSE_GUI
-
-/*
-On Fri, 21 Jul 1995, Paul Craven wrote:
-
-> Is there a way to find the path of running program's executable? I can get
-> my home directory, and the current directory, but I don't know how to get the
-> executable directory.
->
-
-The code below (warty as it is), does what you want on most Unix,
-DOS, and Mac platforms (it's from the ALS Prolog main).
-
-|| Ken Bowen      Applied Logic Systems, Inc.         PO Box 180,
-||====            Voice:  +1 (617)965-9191            Newton Centre,
-||                FAX:    +1 (617)965-1636            MA  02159  USA
-                  Email:  ken@als.com        WWW: http://www.als.com
-------------------------------------------------------------------------
-*/
-
-// This code is commented out but it may be integrated with wxWin at
-// a later date, after testing. Thanks Ken!
-#if 0
-
-/*--------------------------------------------------------------------*
- | whereami is given a filename f in the form:  whereami(argv[0])
- | It returns the directory in which the executable file (containing
- | this code [main.c] ) may be found.  A dot will be returned to indicate
- | the current directory.
- *--------------------------------------------------------------------*/
-
-static void
-whereami(name)
-    char *name;
-{
-    register char *cutoff = NULL;        /* stifle -Wall */
-    register char *s;
-    register char *t;
-    int   cc;
-    char  ebuf[4096];
-
-    /*
-     * See if the file is accessible either through the current directory
-     * or through an absolute path.
-     */
-
-    if (access(name, R_OK) == 0) {
-
-        /*-------------------------------------------------------------*
-         * The file was accessible without any other work.  But the current
-         * working directory might change on us, so if it was accessible
-         * through the cwd, then we should get it for later accesses.
-         *-------------------------------------------------------------*/
-
-        t = imagedir;
-        if (!absolute_pathname(name)) {
-#if defined(DOS) || defined(__WIN32__)
-            int   drive;
-            char *newrbuf;
-
-            newrbuf = imagedir;
-#ifndef __DJGPP__
-            if (*(name + 1) == ':') {
-                if (*name >= 'a' && *name <= 'z')
-                    drive = (int) (*name - 'a' + 1);
-                else
-                    drive = (int) (*name - 'A' + 1);
-                *newrbuf++ = *name;
-                *newrbuf++ = *(name + 1);
-                *newrbuf++ = DIR_SEPARATOR;
-            }
-            else {
-                drive = 0;
-                *newrbuf++ = DIR_SEPARATOR;
-            }
-            if (getcwd(newrbuf, drive) == 0) {        /* } */
-#else
-            if (getcwd(newrbuf, 1024) == 0) {        /* } */
-#endif
-#else  /* DOS */
-#ifdef HAVE_GETWD
-            if (getwd(imagedir) == 0) {                /* } */
-#else  /* !HAVE_GETWD */
-            if (getcwd(imagedir, 1024) == 0) {
-#endif /* !HAVE_GETWD */
-#endif /* DOS */
-                fatal_error(FE_GETCWD, 0);
-            }
-            for (; *t; t++)        /* Set t to end of buffer */
-                ;
-            if (*(t - 1) == DIR_SEPARATOR)        /* leave slash if already
-                                                 * last char
-                                                 */
-                cutoff = t - 1;
-            else {
-                cutoff = t;        /* otherwise put one in */
-                *t++ = DIR_SEPARATOR;
-            }
-        }
-#if (!defined(__MAC__) && !defined(__DJGPP__) && !defined(__GO32__) && !defined(__WIN32__))
-        else
-                (*t++ = DIR_SEPARATOR);
-#endif
-
-        /*-------------------------------------------------------------*
-         * Copy the rest of the string and set the cutoff if it was not
-         * already set.  If the first character of name is a slash, cutoff
-         * is not presently set but will be on the first iteration of the
-         * loop below.
-         *-------------------------------------------------------------*/
-
-        for ((*name == DIR_SEPARATOR ? (s = name+1) : (s = name));;) {
-            if (*s == DIR_SEPARATOR)
-                        cutoff = t;
-            if (!(*t++ = *s++))
-                        break;
-        }
-
-    }
-    else {
-
-        /*-------------------------------------------------------------*
-         * Get the path list from the environment.  If the path list is
-         * inaccessible for any reason, leave with fatal error.
-         *-------------------------------------------------------------*/
-
-#ifdef __MAC__
-        if ((s = getenv("Commands")) == (char *) 0)
-#else
-        if ((s = getenv("PATH")) == (char *) 0)
-#endif
-            fatal_error(FE_PATH, 0);
-
-        /*
-         * Copy path list into ebuf and set the source pointer to the
-         * beginning of this buffer.
-         */
-
-        strcpy(ebuf, s);
-        s = ebuf;
-
-        for (;;) {
-            t = imagedir;
-            while (*s && *s != PATH_SEPARATOR)
-                *t++ = *s++;
-            if (t > imagedir && *(t - 1) == DIR_SEPARATOR)
-                ;                /* do nothing -- slash already is in place */
-            else
-                *t++ = DIR_SEPARATOR;        /* put in the slash */
-            cutoff = t - 1;        /* set cutoff */
-            strcpy(t, name);
-            if (access(imagedir, R_OK) == 0)
-                break;
-
-            if (*s)
-                s++;                /* advance source pointer */
-            else
-                fatal_error(FE_INFND, 0);
-        }
-
-    }
-
-    /*-------------------------------------------------------------*
-     | At this point the full pathname should exist in imagedir and
-     | cutoff should be set to the final slash.  We must now determine
-     | whether the file name is a symbolic link or not and chase it down
-     | if it is.  Note that we reuse ebuf for getting the link.
-     *-------------------------------------------------------------*/
-
-#ifdef HAVE_SYMLINK
-    while ((cc = readlink(imagedir, ebuf, 512)) != -1) {
-        ebuf[cc] = 0;
-        s = ebuf;
-        if (*s == DIR_SEPARATOR) {
-            t = imagedir;
-        }
-        else {
-            t = cutoff + 1;
-        }
-        for (;;) {
-            if (*s == DIR_SEPARATOR)
-                cutoff = t;        /* mark the last slash seen */
-            if (!(*t++ = *s++))        /* copy the character */
-                break;
-        }
-    }
-
-#endif /* HAVE_SYMLINK */
-
-    strcpy(imagename, cutoff + 1);        /* keep the image name */
-    *(cutoff + 1) = 0;                /* chop off the filename part */
-}
-
-#endif
-
-#if wxUSE_GUI
-
 // ----------------------------------------------------------------------------
 // GUI helpers
 // ----------------------------------------------------------------------------
@@ -966,10 +907,19 @@ whereami(name)
  * since otherwise the generic code may be pulled in unnecessarily.
  */
 
+#if wxUSE_MSGDLG
+
 int wxMessageBox(const wxString& message, const wxString& caption, long style,
                  wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) )
 {
-    wxMessageDialog dialog(parent, message, caption, style);
+    long decorated_style = style;
+
+    if ( ( style & ( wxICON_EXCLAMATION | wxICON_HAND | wxICON_INFORMATION | wxICON_QUESTION ) ) == 0 )
+    {
+        decorated_style |= ( style & wxYES ) ? wxICON_QUESTION : wxICON_INFORMATION ;
+    }
+
+    wxMessageDialog dialog(parent, message, caption, decorated_style);
 
     int ans = dialog.ShowModal();
     switch ( ans )
@@ -989,13 +939,24 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
     return wxCANCEL;
 }
 
+#endif // wxUSE_MSGDLG
+
 #if wxUSE_TEXTDLG
+
 wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
                         const wxString& defaultValue, wxWindow *parent,
-                        int x, int y, bool WXUNUSED(centre) )
+                        wxCoord x, wxCoord y, bool centre )
 {
     wxString str;
-    wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
+    long style = wxTextEntryDialogStyle;
+
+    if (centre)
+        style |= wxCENTRE;
+    else
+        style &= ~wxCENTRE;
+
+    wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y));
+
     if (dialog.ShowModal() == wxID_OK)
     {
         str = dialog.GetValue();
@@ -1007,11 +968,19 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
 wxString wxGetPasswordFromUser(const wxString& message,
                                const wxString& caption,
                                const wxString& defaultValue,
-                               wxWindow *parent)
+                               wxWindow *parent,
+                               wxCoord x, wxCoord y, bool centre )
 {
     wxString str;
-    wxTextEntryDialog dialog(parent, message, caption, defaultValue,
-                             wxOK | wxCANCEL | wxTE_PASSWORD);
+    long style = wxTextEntryDialogStyle;
+
+    if (centre)
+        style |= wxCENTRE;
+    else
+        style &= ~wxCENTRE;
+
+    wxPasswordEntryDialog dialog(parent, message, caption, defaultValue,
+                             style, wxPoint(x, y));
     if ( dialog.ShowModal() == wxID_OK )
     {
         str = dialog.GetValue();
@@ -1022,41 +991,56 @@ wxString wxGetPasswordFromUser(const wxString& message,
 
 #endif // wxUSE_TEXTDLG
 
-wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
+#if wxUSE_COLOURDLG
+
+wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption)
 {
-      wxColourData data;
-      data.SetChooseFull(TRUE);
-      if ( colInit.Ok() )
-      {
-          data.SetColour((wxColour &)colInit); // const_cast
-      }
+    wxColourData data;
+    data.SetChooseFull(true);
+    if ( colInit.Ok() )
+    {
+        data.SetColour((wxColour &)colInit); // const_cast
+    }
 
-      wxColour colRet;
-      wxColourDialog dialog(parent, &data);
-      if ( dialog.ShowModal() == wxID_OK )
-      {
-          colRet = dialog.GetColourData().GetColour();
-      }
-      //else: leave it invalid
+    wxColour colRet;
+    wxColourDialog dialog(parent, &data);
+    if (!caption.IsEmpty())
+        dialog.SetTitle(caption);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        colRet = dialog.GetColourData().GetColour();
+    }
+    //else: leave it invalid
 
-      return colRet;
+    return colRet;
 }
 
-// ----------------------------------------------------------------------------
-// missing C RTL functions (FIXME shouldn't be here at all)
-// ----------------------------------------------------------------------------
+#endif // wxUSE_COLOURDLG
 
-#ifdef __MWERKS__
-char *strdup(const char *s)
-{
-        return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ;
-}
+#if wxUSE_FONTDLG
 
-int isascii( int c )
+wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
 {
-        return ( c >= 0 && c < 128 ) ;
+    wxFontData data;
+    if ( fontInit.Ok() )
+    {
+        data.SetInitialFont(fontInit);
+    }
+
+    wxFont fontRet;
+    wxFontDialog dialog(parent, data);
+    if (!caption.IsEmpty())
+        dialog.SetTitle(caption);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        fontRet = dialog.GetFontData().GetChosenFont();
+    }
+    //else: leave it invalid
+
+    return fontRet;
 }
-#endif // __MWERKS__
+
+#endif // wxUSE_FONTDLG
 
 // ----------------------------------------------------------------------------
 // wxSafeYield and supporting functions
@@ -1064,7 +1048,7 @@ int isascii( int c )
 
 void wxEnableTopLevelWindows(bool enable)
 {
-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;
     for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
         node->GetData()->Enable(enable);
 }
@@ -1075,14 +1059,15 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
     // don't reenable them later
     m_winDisabled = NULL;
 
-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;
     for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *winTop = node->GetData();
         if ( winTop == winToSkip )
             continue;
 
-        if ( winTop->IsEnabled() )
+        // we don't need to disable the hidden or already disabled windows
+        if ( winTop->IsEnabled() && winTop->IsShown() )
         {
             winTop->Disable();
         }
@@ -1100,7 +1085,7 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
 
 wxWindowDisabler::~wxWindowDisabler()
 {
-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;
     for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *winTop = node->GetData();
@@ -1116,252 +1101,27 @@ wxWindowDisabler::~wxWindowDisabler()
 
 // Yield to other apps/messages and disable user input to all windows except
 // the given one
-bool wxSafeYield(wxWindow *win)
+bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)
 {
     wxWindowDisabler wd(win);
 
-    bool rc = wxYield();
+    bool rc;
+    if (onlyIfNeeded)
+        rc = wxYieldIfNeeded();
+    else
+        rc = wxYield();
 
     return rc;
 }
 
-// ----------------------------------------------------------------------------
-// misc functions
-// ----------------------------------------------------------------------------
-
 // Don't synthesize KeyUp events holding down a key and producing KeyDown
 // events with autorepeat. On by default and always on in wxMSW. wxGTK version
 // in utilsgtk.cpp.
 #ifndef __WXGTK__
 bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 {
-    return TRUE;    // detectable auto-repeat is the only mode MSW supports
+    return true;    // detectable auto-repeat is the only mode MSW supports
 }
 #endif // !wxGTK
 
 #endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// network and user id functions
-// ----------------------------------------------------------------------------
-
-// Get Full RFC822 style email address
-bool wxGetEmailAddress(wxChar *address, int maxSize)
-{
-    wxString email = wxGetEmailAddress();
-    if ( !email )
-        return FALSE;
-
-    wxStrncpy(address, email, maxSize - 1);
-    address[maxSize - 1] = wxT('\0');
-
-    return TRUE;
-}
-
-wxString wxGetEmailAddress()
-{
-    wxString email;
-
-    wxString host = wxGetFullHostName();
-    if ( !!host )
-    {
-        wxString user = wxGetUserId();
-        if ( !!user )
-        {
-            email << user << wxT('@') << host;
-        }
-    }
-
-    return email;
-}
-
-wxString wxGetUserId()
-{
-    static const int maxLoginLen = 256; // FIXME arbitrary number
-
-    wxString buf;
-    bool ok = wxGetUserId(buf.GetWriteBuf(maxLoginLen), maxLoginLen);
-    buf.UngetWriteBuf();
-
-    if ( !ok )
-        buf.Empty();
-
-    return buf;
-}
-
-wxString wxGetUserName()
-{
-    static const int maxUserNameLen = 1024; // FIXME arbitrary number
-
-    wxString buf;
-    bool ok = wxGetUserName(buf.GetWriteBuf(maxUserNameLen), maxUserNameLen);
-    buf.UngetWriteBuf();
-
-    if ( !ok )
-        buf.Empty();
-
-    return buf;
-}
-
-wxString wxGetHostName()
-{
-    static const size_t hostnameSize = 257;
-
-    wxString buf;
-    bool ok = wxGetHostName(buf.GetWriteBuf(hostnameSize), hostnameSize);
-
-    buf.UngetWriteBuf();
-
-    if ( !ok )
-        buf.Empty();
-
-    return buf;
-}
-
-wxString wxGetFullHostName()
-{
-    static const size_t hostnameSize = 257;
-
-    wxString buf;
-    bool ok = wxGetFullHostName(buf.GetWriteBuf(hostnameSize), hostnameSize);
-
-    buf.UngetWriteBuf();
-
-    if ( !ok )
-        buf.Empty();
-
-    return buf;
-}
-
-wxString wxGetHomeDir()
-{
-    wxString home;
-    wxGetHomeDir(&home);
-
-    return home;
-}
-
-#if 0
-
-wxString wxGetCurrentDir()
-{
-    wxString dir;
-    size_t len = 1024;
-    bool ok;
-    do
-    {
-        ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL;
-        dir.UngetWriteBuf();
-
-        if ( !ok )
-        {
-            if ( errno != ERANGE )
-            {
-                wxLogSysError(_T("Failed to get current directory"));
-
-                return wxEmptyString;
-            }
-            else
-            {
-                // buffer was too small, retry with a larger one
-                len *= 2;
-            }
-        }
-        //else: ok
-    } while ( !ok );
-
-    return dir;
-}
-
-#endif // 0
-
-// ----------------------------------------------------------------------------
-// wxExecute
-// ----------------------------------------------------------------------------
-
-// this is a private function because it hasn't a clean interface: the first
-// array is passed by reference, the second by pointer - instead we have 2
-// public versions of wxExecute() below
-static long wxDoExecuteWithCapture(const wxString& command,
-                                   wxArrayString& output,
-                                   wxArrayString* error)
-{
-#ifdef __WIN16__
-    wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16.");
-
-    return 0;
-#else // !Win16
-    // create a wxProcess which will capture the output
-    wxProcess *process = new wxProcess;
-    process->Redirect();
-
-    long rc = wxExecute(command, TRUE /* sync */, process);
-
-#if wxUSE_STREAMS
-    if ( rc != -1 )
-    {
-        wxInputStream* is = process->GetInputStream();
-        wxCHECK_MSG( is, -1, _T("if wxExecute() succeded, stream can't be NULL") );
-        wxTextInputStream tis(*is);
-
-        wxTextInputStream *tes = NULL;
-        wxInputStream *es = NULL;
-        if ( error )
-        {
-            es = process->GetErrorStream();
-
-            wxCHECK_MSG( es, -1, _T("stderr can't be NULL") );
-
-            tes = new wxTextInputStream(*es);
-        }
-
-        bool cont;
-        do
-        {
-            cont = FALSE;
-
-            if ( !is->Eof() && is->IsOk() )
-            {
-                wxString line = tis.ReadLine();
-                if ( is->LastError() )
-                    break;
-
-                cont = TRUE;
-
-                output.Add(line);
-            }
-
-            if ( error && !es->Eof() && es->IsOk() )
-            {
-                wxString line = tes->ReadLine();
-                if ( es->LastError() )
-                    break;
-
-                cont = TRUE;
-
-                error->Add(line);
-            }
-        }
-        while ( cont );
-
-        delete tes;
-    }
-#endif // wxUSE_STREAMS
-
-    delete process;
-
-    return rc;
-#endif // IO redirection supoprted
-}
-
-long wxExecute(const wxString& command, wxArrayString& output)
-{
-    return wxDoExecuteWithCapture(command, output, NULL);
-}
-
-long wxExecute(const wxString& command,
-               wxArrayString& output,
-               wxArrayString& error)
-{
-    return wxDoExecuteWithCapture(command, output, &error);
-}