Now uses proper wxUSE_xxx flags

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 813ca852f50885bf4446c4e213fb9564e9da75ed..1dffad113ce7d656c7e24408c302a4437ee42d8f 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -168,6 +168,12 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 #endif
 
 #else
 #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__)
 // 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__)


@@ -180,14 +186,14 @@ extern "C"
 #endif  /* __WXMSW__ */
 
 
 #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;
 }
 
   return news;
 }


@@ -212,50 +218,50 @@ wxRegisterId (long id)
 }
 
 void
 }
 
 void

-StringToFloat (char *s, float *number)
+StringToFloat (wxChar *s, float *number)

 {
   if (s && *s && number)
 {
   if (s && *s && number)

-    *number = (float) strtod (s, (char **) NULL);
+    *number = (float) wxStrtod (s, (wxChar **) NULL);

 }
 
 void
 }
 
 void

-StringToDouble (char *s, double *number)
+StringToDouble (wxChar *s, double *number)

 {
   if (s && *s && 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, "%.2f", number);

-  sprintf (buf, fmt, number);
+  wxSprintf (buf, fmt, number);

   return buf;
 }
 
   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
   return buf;
 }
 
 void

-StringToInt (char *s, int *number)
+StringToInt (wxChar *s, int *number)

 {
   if (s && *s && number)
 {
   if (s && *s && number)

-    *number = (int) strtol (s, (char **) NULL, 10);
+    *number = (int) wxStrtol (s, (wxChar **) NULL, 10);

 }
 
 void
 }
 
 void

-StringToLong (char *s, long *number)
+StringToLong (wxChar *s, long *number)

 {
   if (s && *s && number)
 {
   if (s && *s && number)

-    *number = strtol (s, (char **) NULL, 10);
+    *number = wxStrtol (s, (wxChar **) NULL, 10);

 }
 
 wxChar *
 }
 
 wxChar *


@@ -355,6 +361,16 @@ 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]
 wxString wxNow( void )
 // Return the current date/time
 // [volatile]
 wxString wxNow( void )


@@ -369,25 +385,25 @@ wxString wxNow( void )
  * Strip out any menu codes
  */
 
  * Strip out any menu codes
  */
 

-char *wxStripMenuCodes (char *in, char *out)
+wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)

 {
   if (!in)
 {
   if (!in)

-    return (char *) NULL;
+    return (wxChar *) NULL;

 
   if (!out)
     out = copystring(in);
 
 
   if (!out)
     out = copystring(in);
 

-  char *tmpOut = out;
+  wxChar *tmpOut = out;

 
   while (*in)
     {
 
   while (*in)
     {

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

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

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

             *out++ = *in++;
         }
             *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.
         {
           // Remove all stuff after \t in X mode, and let the stuff as is
           // in Windows mode.


@@ -399,7 +415,7 @@ char *wxStripMenuCodes (char *in, char *out)
         *out++ = *in++;
     }                                // while
 
         *out++ = *in++;
     }                                // while
 

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

 
   return tmpOut;
 }
 
   return tmpOut;
 }


@@ -459,7 +475,7 @@ wxFindWindowByLabel1 (const wxString& title, wxWindow * parent)
 
     if (parent)
     {
 
     if (parent)
     {

-        for ( wxNode * node = parent->GetChildren().GetFirst();
+        for ( wxWindowList::Node * node = parent->GetChildren().GetFirst();

               node;
               node = node->GetNext() )
         {
               node;
               node = node->GetNext() )
         {


@@ -743,12 +759,12 @@ void wxEnableTopLevelWindows(bool enable)
 // Yield to other apps/messages and disable user input
 bool wxSafeYield(wxWindow *win)
 {
 // Yield to other apps/messages and disable user input
 bool wxSafeYield(wxWindow *win)
 {

-   wxEnableTopLevelWindow(FALSE);
+   wxEnableTopLevelWindows(FALSE);

    // always enable ourselves
    if ( win )
       win->Enable(TRUE);
    bool rc = wxYield();
    // always enable ourselves
    if ( win )
       win->Enable(TRUE);
    bool rc = wxYield();

-   wxEnableToplevelWindows(TRUE);
+   wxEnableTopLevelWindows(TRUE);

    return rc;
 }
 
    return rc;
 }
 


@@ -782,6 +798,7 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
     return ans;
 }
 
     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) )
 wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
                         const wxString& defaultValue, wxWindow *parent,
                         int x, int y, bool WXUNUSED(centre) )


@@ -792,6 +809,7 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
     else
         return wxString("");
 }
     else
         return wxString("");
 }

+#endif // wxUSE_TEXTDLG

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


@@ -883,3 +901,18 @@ wxString wxGetHostName()
     return buf;
 }
 
     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;
+}
+