Stupid timeout bug fixed

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 4b6e87cbce6b3cb833e1c02acf1973ef5c4d0cfe..9dd4d99b3e0abd75eb624a1c3e1caf7c31229d90 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -9,47 +9,68 @@
 // 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"
-#endif
+    #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

 
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #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

+

 #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>
+    #include <clib.h>

 #endif
 
 #endif
 

-// Pattern matching code.
+// Pattern matching code. (FIXME)

 // Yes, this path is deliberate (for Borland compilation)
 #ifdef wx_mac /* MATTHEW: [5] Mac doesn't like paths with "/" */
 #include "glob.inc"
 // Yes, this path is deliberate (for Borland compilation)
 #ifdef wx_mac /* MATTHEW: [5] Mac doesn't like paths with "/" */
 #include "glob.inc"


@@ -58,20 +79,26 @@
 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

-#include "windows.h"
+    #include "windows.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 +128,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 +151,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 +173,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__
 


@@ -177,11 +205,15 @@ extern "C"
 #endif
 #endif  /* __WXMSW__ */
 
 #endif
 #endif  /* __WXMSW__ */
 

+#ifdef __WXPM__
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
+#endif

 
 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];


@@ -261,7 +293,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;
 }
 


@@ -270,27 +302,27 @@ 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 * 16 + secondDigit;
 }


@@ -353,19 +385,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);


@@ -373,9 +395,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)
 {


@@ -389,13 +413,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.


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

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

 
   return tmpOut;
 }
 
   return tmpOut;
 }


@@ -421,10 +445,94 @@ 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 {
+#if 0 // this is not supported by GTK+, apparently
+                    // several special cases
+                    current.MakeUpper();
+                    if ( current == wxT("DEL") ) {
+                        keyCode = VK_DELETE;
+                    }
+                    else if ( current == wxT("PGUP") ) {
+                        keyCode = VK_PRIOR;
+                    }
+                    else if ( current == wxT("PGDN") ) {
+                        keyCode = VK_NEXT;
+                    }
+                    else
+#endif // 0
+                    {
+                        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


@@ -549,6 +657,8 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
   return menuBar->FindMenuItem (menuString, itemString);
 }
 
   return menuBar->FindMenuItem (menuString, itemString);
 }
 

+#endif // wxUSE_GUI
+

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


@@ -741,24 +851,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


@@ -813,7 +911,42 @@ int isascii( int c )
 {
         return ( c >= 0 && c < 128 ) ;
 }
 {
         return ( c >= 0 && c < 128 ) ;
 }

-#endif
+#endif // __MWERKS__
+
+// ----------------------------------------------------------------------------
+// misc functions
+// ----------------------------------------------------------------------------
+
+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;
+}
+
+// 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


@@ -827,7 +960,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;
 }


@@ -843,7 +976,7 @@ wxString wxGetEmailAddress()
         if ( !!user )
         {
             wxString email(user);
         if ( !!user )
         {
             wxString email(user);

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

         }
     }
 
         }
     }
 


@@ -908,3 +1041,10 @@ wxString wxGetFullHostName()
     return buf;
 }
 
     return buf;
 }
 

+wxString wxGetHomeDir()
+{
+    wxString home;
+    wxGetHomeDir(&home);
+
+    return home;
+}