applied Unicode fixes for mingw32 (patch 429654)

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 08eed2a299b45a68c5579d139c8a822df147c7d9..6020b8780d182b7ee3c29203f59b716dba033cca 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -9,69 +9,101 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "utils.h"
+    #pragma implementation "utils.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/window.h"
-#include "wx/menu.h"
-#include "wx/frame.h"
-#include "wx/msgdlg.h"
-#include "wx/textdlg.h"
+    #include "wx/defs.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+
+    #if wxUSE_GUI
+        #include "wx/window.h"
+        #include "wx/menu.h"
+        #include "wx/frame.h"
+        #include "wx/msgdlg.h"
+        #include "wx/textdlg.h"
+        #if wxUSE_ACCEL
+            #include "wx/menuitem.h"
+            #include "wx/accel.h"
+        #endif // wxUSE_ACCEL
+    #endif // wxUSE_GUI
+#endif // WX_PRECOMP
+
+#ifndef __WIN16__
+#include "wx/process.h"
+#include "wx/txtstrm.h"

 #endif
 
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #endif
 
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+

 #if !defined(__WATCOMC__)
     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif
 #endif
 #if !defined(__WATCOMC__)
     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif
 #endif

+
+#if wxUSE_GUI
+    #include "wx/colordlg.h"
+    #include "wx/notebook.h"
+    #include "wx/frame.h"
+    #include "wx/statusbr.h"
+    #include "wx/toolbar.h"
+#endif // wxUSE_GUI
+

 #include <time.h>
 #include <time.h>

+

 #ifndef __MWERKS__
 #ifndef __MWERKS__

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

 #endif
 
 #ifdef __SALFORDC__
 #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 "/" */
-#include "glob.inc"
-#else
-#include "../common/glob.inc"
+    #include <clib.h>

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

-#include "windows.h"
+    #include "wx/msw/private.h"

 #endif
 
 #endif
 

-#define _MAXPATHLEN 500
+// ----------------------------------------------------------------------------
+// function protoypes
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI
+    static wxWindow *wxFindWindowByLabel1(const wxString& title, wxWindow *parent);
+    static wxWindow *wxFindWindowByName1 (const wxString& title, wxWindow *parent);
+#endif // wxUSE_GUI

 
 

-extern wxChar *wxBuffer;
+// ============================================================================
+// implementation
+// ============================================================================

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// private functions
+// string functions

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-static wxWindow *wxFindWindowByLabel1(const wxString& title, wxWindow * parent);
-static wxWindow *wxFindWindowByName1 (const wxString& title, wxWindow * parent);
-

 #ifdef __WXMAC__
 int strcasecmp(const char *str_1, const char *str_2)
 {
 #ifdef __WXMAC__
 int strcasecmp(const char *str_1, const char *str_2)
 {


@@ -101,8 +133,9 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
   return 0 ;
 
 }
   return 0 ;
 
 }

-#endif
-#ifdef __VMS__
+#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
 // 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


@@ -123,7 +156,7 @@ int strcasecmp(const char *str_1, const char *str_2)
   myLowerString(temp1);
   myLowerString(temp2);
 
   myLowerString(temp1);
   myLowerString(temp2);
 

-  int result = strcmp(temp1,temp2);
+  int result = wxStrcmp(temp1,temp2);

   delete[] temp1;
   delete[] temp2;
 
   delete[] temp1;
   delete[] temp2;
 


@@ -145,7 +178,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 
   return(result);
 }
 
   return(result);
 }

-#endif
+#endif // __VMS__

 
 #ifdef __WINDOWS__
 
 
 #ifdef __WINDOWS__
 


@@ -185,7 +218,7 @@ extern "C"
 wxChar *
 copystring (const wxChar *s)
 {
 wxChar *
 copystring (const wxChar *s)
 {

-  if (s == NULL) s = _T("");
+  if (s == NULL) s = wxT("");

   size_t len = wxStrlen (s) + 1;
 
   wxChar *news = new wxChar[len];
   size_t len = wxStrlen (s) + 1;
 
   wxChar *news = new wxChar[len];


@@ -265,7 +298,7 @@ IntToString (int number)
 {
   static wxChar buf[20];
 
 {
   static wxChar buf[20];
 

-  wxSprintf (buf, _T("%d"), number);
+  wxSprintf (buf, wxT("%d"), number);

   return buf;
 }
 
   return buf;
 }
 


@@ -274,29 +307,29 @@ LongToString (long number)
 {
   static wxChar buf[20];
 
 {
   static wxChar buf[20];
 

-  wxSprintf (buf, _T("%ld"), number);
+  wxSprintf (buf, wxT("%ld"), number);

   return buf;
 }
 
 // Array used in DecToHex conversion routine.
   return buf;
 }
 
 // Array used in DecToHex conversion routine.

-static wxChar hexArray[] = _T("0123456789ABCDEF");
+static wxChar hexArray[] = wxT("0123456789ABCDEF");

 
 // Convert 2-digit hex number to decimal
 int wxHexToDec(const wxString& buf)
 {
   int firstDigit, secondDigit;
 
 
 // Convert 2-digit hex number to decimal
 int wxHexToDec(const wxString& buf)
 {
   int firstDigit, secondDigit;
 

-  if (buf.GetChar(0) >= _T('A'))
-    firstDigit = buf.GetChar(0) - _T('A') + 10;
+  if (buf.GetChar(0) >= wxT('A'))
+    firstDigit = buf.GetChar(0) - wxT('A') + 10;

   else
   else

-    firstDigit = buf.GetChar(0) - _T('0');
+    firstDigit = buf.GetChar(0) - wxT('0');

 
 

-  if (buf.GetChar(1) >= _T('A'))
-    secondDigit = buf.GetChar(1) - _T('A') + 10;
+  if (buf.GetChar(1) >= wxT('A'))
+    secondDigit = buf.GetChar(1) - wxT('A') + 10;

   else
   else

-    secondDigit = buf.GetChar(1) - _T('0');
+    secondDigit = buf.GetChar(1) - wxT('0');

 
 

-  return firstDigit * 16 + secondDigit;
+  return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );

 }
 
 // Convert decimal integer to 2-character hex string
 }
 
 // Convert decimal integer to 2-character hex string


@@ -357,19 +390,9 @@ StringMatch (char *str1, char *str2, bool subString, bool exact)
   return FALSE;
 }
 
   return FALSE;
 }
 

-// Don't synthesize KeyUp events holding down a key and producing
-// KeyDown events with autorepeat. On by default and always on
-// 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
-}
-#endif
-

 // Return the current date/time
 // [volatile]
 // Return the current date/time
 // [volatile]

-wxString wxNow( void )
+wxString wxNow()

 {
   time_t now = time((time_t *) NULL);
   char *date = ctime(&now);
 {
   time_t now = time((time_t *) NULL);
   char *date = ctime(&now);


@@ -377,9 +400,11 @@ wxString wxNow( void )
   return wxString(date);
 }
 
   return wxString(date);
 }
 

-/*
- * Strip out any menu codes
- */
+#if wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// Menu accelerators related functions
+// ----------------------------------------------------------------------------

 
 wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
 {
 
 wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
 {


@@ -393,13 +418,13 @@ wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
 
   while (*in)
     {
 
   while (*in)
     {

-      if (*in == _T('&'))
+      if (*in == wxT('&'))

         {
           // Check && -> &, &x -> x
         {
           // Check && -> &, &x -> x

-          if (*++in == _T('&'))
+          if (*++in == wxT('&'))

             *out++ = *in++;
         }
             *out++ = *in++;
         }

-      else if (*in == _T('\t'))
+      else if (*in == wxT('\t'))

         {
           // Remove all stuff after \t in X mode, and let the stuff as is
           // in Windows mode.
         {
           // Remove all stuff after \t in X mode, and let the stuff as is
           // in Windows mode.


@@ -411,7 +436,7 @@ wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
         *out++ = *in++;
     }                                // while
 
         *out++ = *in++;
     }                                // while
 

-  *out = _T('\0');
+  *out = wxT('\0');

 
   return tmpOut;
 }
 
   return tmpOut;
 }


@@ -425,10 +450,103 @@ wxString wxStripMenuCodes(const wxString& str)
     return str1;
 }
 
     return str1;
 }
 

-/*
- * Window search functions
- *
- */
+#if wxUSE_ACCEL
+
+// return wxAcceleratorEntry for the given menu string or NULL if none
+// specified
+wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
+{
+    // 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());
+                }
+
+                current.Empty();
+            }
+            else {
+                current += wxTolower(label[n]);
+            }
+        }
+
+        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 ( keyCode ) {
+            // we do have something
+            return new wxAcceleratorEntry(accelFlags, keyCode);
+        }
+    }
+
+    return (wxAcceleratorEntry *)NULL;
+}
+
+#endif // wxUSE_ACCEL
+
+// ----------------------------------------------------------------------------
+// Window search functions
+// ----------------------------------------------------------------------------

 
 /*
  * If parent is non-NULL, look through children for a label or title
 
 /*
  * If parent is non-NULL, look through children for a label or title


@@ -553,6 +671,97 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
   return menuBar->FindMenuItem (menuString, itemString);
 }
 
   return menuBar->FindMenuItem (menuString, itemString);
 }
 

+// Try to find the deepest child that contains 'pt'.
+// We go backwards, to try to allow for controls that are spacially
+// within other controls, but are still siblings (e.g. buttons within
+// static boxes). Static boxes are likely to be created _before_ controls
+// that sit inside them.
+wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
+{
+    if (!win->IsShown())
+        return NULL;
+
+    // Hack for wxNotebook case: at least in wxGTK, all pages
+    // claim to be shown, so we must only deal with the selected one.
+    if (win->IsKindOf(CLASSINFO(wxNotebook)))
+    {
+      wxNotebook* nb = (wxNotebook*) win;
+      int sel = nb->GetSelection();
+      if (sel >= 0)
+      {
+        wxWindow* child = nb->GetPage(sel);
+        wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+        if (foundWin)
+           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();
+      }
+    }
+    */
+
+    wxNode* node = win->GetChildren().Last();
+    while (node)
+    {
+        wxWindow* child = (wxWindow*) node->Data();
+        wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+        if (foundWin)
+          return foundWin;
+        node = node->Previous();
+    }
+
+    wxPoint pos = win->GetPosition();
+    wxSize sz = win->GetSize();
+    if (win->GetParent())
+    {
+        pos = win->GetParent()->ClientToScreen(pos);
+    }
+
+    wxRect rect(pos, sz);
+    if (rect.Inside(pt))
+        return win;
+    else
+        return NULL;
+}
+
+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();
+    while (node)
+    {
+        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* found = wxFindWindowAtPoint(win, pt);
+        if (found)
+            return found;
+        node = node->Previous();
+    }
+    return NULL;
+}
+
+#endif // wxUSE_GUI
+

 /*
 On Fri, 21 Jul 1995, Paul Craven wrote:
 
 /*
 On Fri, 21 Jul 1995, Paul Craven wrote:
 


@@ -745,24 +954,12 @@ whereami(name)
 }
 
 #endif
 }
 
 #endif

-void wxEnableTopLevelWindows(bool enable)
-{
-   wxWindowList::Node *node;
-   for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
-      node->GetData()->Enable(enable);
-}

 
 

-// Yield to other apps/messages and disable user input
-bool wxSafeYield(wxWindow *win)
-{
-   wxEnableTopLevelWindows(FALSE);
-   // always enable ourselves
-   if ( win )
-      win->Enable(TRUE);
-   bool rc = wxYield();
-   wxEnableTopLevelWindows(TRUE);
-   return rc;
-}
+#if wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// GUI helpers
+// ----------------------------------------------------------------------------

 
 /*
  * N.B. these convenience functions must be separate from msgdlgg.cpp, textdlgg.cpp
 
 /*
  * N.B. these convenience functions must be separate from msgdlgg.cpp, textdlgg.cpp


@@ -779,19 +976,17 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
     {
         case wxID_OK:
             return wxOK;
     {
         case wxID_OK:
             return wxOK;

-            break;

         case wxID_YES:
             return wxYES;
         case wxID_YES:
             return wxYES;

-            break;

         case wxID_NO:
             return wxNO;
         case wxID_NO:
             return wxNO;

-            break;
-        default:

         case wxID_CANCEL:
             return wxCANCEL;
         case wxID_CANCEL:
             return wxCANCEL;

-            break;

     }
     }

-    return ans;
+
+    wxFAIL_MSG( _T("unexpected return code from wxMessageDialog") );
+
+    return wxCANCEL;

 }
 
 #if wxUSE_TEXTDLG
 }
 
 #if wxUSE_TEXTDLG


@@ -799,14 +994,58 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
                         const wxString& defaultValue, wxWindow *parent,
                         int x, int y, bool WXUNUSED(centre) )
 {
                         const wxString& defaultValue, wxWindow *parent,
                         int x, int y, bool WXUNUSED(centre) )
 {

+    wxString str;

     wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
     if (dialog.ShowModal() == wxID_OK)
     wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
     if (dialog.ShowModal() == wxID_OK)

-        return dialog.GetValue();
-    else
-        return wxString("");
+    {
+        str = dialog.GetValue();
+    }
+
+    return str;
+}
+
+wxString wxGetPasswordFromUser(const wxString& message,
+                               const wxString& caption,
+                               const wxString& defaultValue,
+                               wxWindow *parent)
+{
+    wxString str;
+    wxTextEntryDialog dialog(parent, message, caption, defaultValue,
+                             wxOK | wxCANCEL | wxTE_PASSWORD);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        str = dialog.GetValue();
+    }
+
+    return str;

 }
 }

+

 #endif // wxUSE_TEXTDLG
 
 #endif // wxUSE_TEXTDLG
 

+wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
+{
+      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
+
+      return colRet;
+}
+
+// ----------------------------------------------------------------------------
+// missing C RTL functions (FIXME shouldn't be here at all)
+// ----------------------------------------------------------------------------
+

 #ifdef __MWERKS__
 char *strdup(const char *s)
 {
 #ifdef __MWERKS__
 char *strdup(const char *s)
 {


@@ -817,7 +1056,90 @@ int isascii( int c )
 {
         return ( c >= 0 && c < 128 ) ;
 }
 {
         return ( c >= 0 && c < 128 ) ;
 }

-#endif
+#endif // __MWERKS__
+
+// ----------------------------------------------------------------------------
+// wxSafeYield and supporting functions
+// ----------------------------------------------------------------------------
+
+void wxEnableTopLevelWindows(bool enable)
+{
+    wxWindowList::Node *node;
+    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+        node->GetData()->Enable(enable);
+}
+
+wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
+{
+    // remember the top level windows which were already disabled, so that we
+    // don't reenable them later
+    m_winDisabled = NULL;
+
+    wxWindowList::Node *node;
+    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+    {
+        wxWindow *winTop = node->GetData();
+        if ( winTop == winToSkip )
+            continue;
+
+        if ( winTop->IsEnabled() )
+        {
+            winTop->Disable();
+        }
+        else
+        {
+            if ( !m_winDisabled )
+            {
+                m_winDisabled = new wxWindowList;
+            }
+
+            m_winDisabled->Append(winTop);
+        }
+    }
+}
+
+wxWindowDisabler::~wxWindowDisabler()
+{
+    wxWindowList::Node *node;
+    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+    {
+        wxWindow *winTop = node->GetData();
+        if ( !m_winDisabled || !m_winDisabled->Find(winTop) )
+        {
+            winTop->Enable();
+        }
+        //else: had been already disabled, don't reenable
+    }
+
+    delete m_winDisabled;
+}
+
+// Yield to other apps/messages and disable user input to all windows except
+// the given one
+bool wxSafeYield(wxWindow *win)
+{
+    wxWindowDisabler wd(win);
+
+    bool 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
+}
+#endif // !wxGTK
+
+#endif // wxUSE_GUI

 
 // ----------------------------------------------------------------------------
 // network and user id functions
 
 // ----------------------------------------------------------------------------
 // network and user id functions


@@ -831,7 +1153,7 @@ bool wxGetEmailAddress(wxChar *address, int maxSize)
         return FALSE;
 
     wxStrncpy(address, email, maxSize - 1);
         return FALSE;
 
     wxStrncpy(address, email, maxSize - 1);

-    address[maxSize - 1] = _T('\0');
+    address[maxSize - 1] = wxT('\0');

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -840,14 +1162,13 @@ wxString wxGetEmailAddress()
 {
     wxString email;
 
 {
     wxString email;
 

-    wxString host = wxGetHostName();
+    wxString host = wxGetFullHostName();

     if ( !!host )
     {
         wxString user = wxGetUserId();
         if ( !!user )
         {
     if ( !!host )
     {
         wxString user = wxGetUserId();
         if ( !!user )
         {

-            wxString email(user);
-            email << _T('@') << host;
+            email << user << wxT('@') << host;

         }
     }
 
         }
     }
 


@@ -912,3 +1233,135 @@ wxString wxGetFullHostName()
     return buf;
 }
 
     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);
+}