X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84fff0b395adcfecd09dd65389ba7c1c47dd7eee..f61757b17c623137d439b3cbe34960f7ce1e9601:/src/common/utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index f6cec3461c..8ad2a9d596 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -180,14 +180,14 @@ extern "C"
 #endif  /* __WXMSW__ */
 
 
-char *
-copystring (const char *s)
+wxChar *
+copystring (const wxChar *s)
 {
-  if (s == NULL) s = "";
-  size_t len = strlen (s) + 1;
+  if (s == NULL) s = _T("");
+  size_t len = wxStrlen (s) + 1;
 
-  char *news = new char[len];
-  memcpy (news, s, len);    // Should be the fastest
+  wxChar *news = new wxChar[len];
+  memcpy (news, s, len * sizeof(wxChar));    // Should be the fastest
 
   return news;
 }
@@ -212,50 +212,50 @@ wxRegisterId (long id)
 }
 
 void
-StringToFloat (char *s, float *number)
+StringToFloat (wxChar *s, float *number)
 {
   if (s && *s && number)
-    *number = (float) strtod (s, (char **) NULL);
+    *number = (float) wxStrtod (s, (wxChar **) NULL);
 }
 
 void
-StringToDouble (char *s, double *number)
+StringToDouble (wxChar *s, double *number)
 {
   if (s && *s && number)
-    *number = strtod (s, (char **) NULL);
+    *number = wxStrtod (s, (wxChar **) NULL);
 }
 
-char *
-FloatToString (float number, const char *fmt)
+wxChar *
+FloatToString (float number, const wxChar *fmt)
 {
-  static char buf[256];
+  static wxChar buf[256];
 
 //  sprintf (buf, "%.2f", number);
-  sprintf (buf, fmt, number);
+  wxSprintf (buf, fmt, number);
   return buf;
 }
 
-char *
-DoubleToString (double number, const char *fmt)
+wxChar *
+DoubleToString (double number, const wxChar *fmt)
 {
-  static char buf[256];
+  static wxChar buf[256];
 
-  sprintf (buf, fmt, number);
+  wxSprintf (buf, fmt, number);
   return buf;
 }
 
 void
-StringToInt (char *s, int *number)
+StringToInt (wxChar *s, int *number)
 {
   if (s && *s && number)
-    *number = (int) strtol (s, (char **) NULL, 10);
+    *number = (int) wxStrtol (s, (wxChar **) NULL, 10);
 }
 
 void
-StringToLong (char *s, long *number)
+StringToLong (wxChar *s, long *number)
 {
   if (s && *s && number)
-    *number = strtol (s, (char **) NULL, 10);
+    *number = wxStrtol (s, (wxChar **) NULL, 10);
 }
 
 wxChar *
@@ -355,6 +355,16 @@ StringMatch (char *str1, char *str2, bool subString, bool exact)
   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]
 wxString wxNow( void )
@@ -369,25 +379,25 @@ wxString wxNow( void )
  * Strip out any menu codes
  */
 
-char *wxStripMenuCodes (char *in, char *out)
+wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
 {
   if (!in)
-    return (char *) NULL;
+    return (wxChar *) NULL;
 
   if (!out)
     out = copystring(in);
 
-  char *tmpOut = out;
+  wxChar *tmpOut = out;
 
   while (*in)
     {
-      if (*in == '&')
+      if (*in == _T('&'))
         {
           // Check && -> &, &x -> x
-          if (*++in == '&')
+          if (*++in == _T('&'))
             *out++ = *in++;
         }
-      else if (*in == '\t')
+      else if (*in == _T('\t'))
         {
           // Remove all stuff after \t in X mode, and let the stuff as is
           // in Windows mode.
@@ -399,7 +409,7 @@ char *wxStripMenuCodes (char *in, char *out)
         *out++ = *in++;
     }                                // while
 
-  *out = '\0';
+  *out = _T('\0');
 
   return tmpOut;
 }
@@ -459,7 +469,7 @@ wxFindWindowByLabel1 (const wxString& title, wxWindow * parent)
 
     if (parent)
     {
-        for ( wxNode * node = parent->GetChildren().GetFirst();
+        for ( wxWindowList::Node * node = parent->GetChildren().GetFirst();
               node;
               node = node->GetNext() )
         {
@@ -733,28 +743,23 @@ whereami(name)
 }
 
 #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)
 {
-    wxWindowList::Node *node;
-    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
-    {
-        node->GetData()->Enable(FALSE);
-    }
-
-    // always enable ourselves
-    if ( win )
-        win->Enable(TRUE);
-    bool rc = wxYield();
-
-    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
-    {
-        node->GetData()->Enable(TRUE);
-    }
-
-    return rc;
+   wxEnableTopLevelWindows(FALSE);
+   // always enable ourselves
+   if ( win )
+      win->Enable(TRUE);
+   bool rc = wxYield();
+   wxEnableTopLevelWindows(TRUE);
+   return rc;
 }
 
 /*
@@ -787,6 +792,7 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
     return ans;
 }
 
+#if wxUSE_TEXTDLG
 wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
                         const wxString& defaultValue, wxWindow *parent,
                         int x, int y, bool WXUNUSED(centre) )
@@ -797,6 +803,7 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
     else
         return wxString("");
 }
+#endif // wxUSE_TEXTDLG
 
 #ifdef __MWERKS__
 char *strdup(const char *s)