Added wxString::FromAscii() for char

Used it in protocol.cpp which probably assumes ASCII anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/string.h

@@ -461,10 +461,12 @@ public:
     // the behaviour of these functions with the strings containing anything
     // else than 7 bit ASCII characters is undefined, use at your own risk.
 #if wxUSE_UNICODE
-    static wxString FromAscii(const char *ascii);
+    static wxString FromAscii(const char *ascii);  // string
+    static wxString FromAscii(const char ascii);   // char
     const wxCharBuffer ToAscii() const;
 #else // ANSI
     static wxString FromAscii(const char *ascii) { return wxString( ascii ); }
+    static wxString FromAscii(const char ascii) { return wxString( ascii ); }
     const char *ToAscii() const { return c_str(); }
 #endif // Unicode/!Unicode
 

src/common/protocol.cpp

@@ -41,12 +41,12 @@
 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
 {
-  m_protoname = name;
+    m_protoname = name;
-  m_servname = serv;
+    m_servname = serv;
-  m_cinfo = info;
+    m_cinfo = info;
-  m_needhost = need_host1;
+    m_needhost = need_host1;
-  next = wxURL::ms_protocols;
+    next = wxURL::ms_protocols;
-  wxURL::ms_protocols = this;
+    wxURL::ms_protocols = this;
 }
 
 /////////////////////////////////////////////////////////////////
@@ -69,19 +69,21 @@ wxProtocol::wxProtocol()
 #if wxUSE_SOCKETS
 bool wxProtocol::Reconnect()
 {
-  wxIPV4address addr;
+    wxIPV4address addr;
 
-  if (!GetPeer(addr))
+    if (!GetPeer(addr))
-  {
+    {
-    Close();
+        Close();
-    return FALSE;
+        return FALSE;
-  }
+    }
-  if (!Close())
-    return FALSE;
-  if (!Connect(addr))
-    return FALSE;
 
-  return TRUE;
+    if (!Close())
+        return FALSE;
+        
+    if (!Connect(addr))
+        return FALSE;
+
+    return TRUE;
 }
 
 // ----------------------------------------------------------------------------
@@ -117,11 +119,11 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *socket, wxString& result)
                 // normal char
                 if ( chLast )
                 {
-                    result += chLast;
+                    result += wxString::FromAscii( chLast );
                     chLast = '\0';
                 }
 
-                result += ch;
+                result += wxString::FromAscii( ch );
         }
     }
 
@@ -134,38 +136,42 @@ wxProtocolError wxProtocol::ReadLine(wxString& result)
 }
 
 // old function which only chops '\n' and not '\r\n'
-wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
+wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
+{
 #define PROTO_BSIZE 2048
-  size_t avail, size;
+    size_t avail, size;
-  char tmp_buf[PROTO_BSIZE], tmp_str[PROTO_BSIZE];
+    char tmp_buf[PROTO_BSIZE], tmp_str[PROTO_BSIZE];
-  char *ret;
+    char *ret;
-  bool found;
+    bool found;
 
-  avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
+    avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
-  if (sock->Error() || avail == 0)
+    if (sock->Error() || avail == 0)
-    return wxPROTO_NETERR;
+        return wxPROTO_NETERR;
 
-  memcpy(tmp_str, tmp_buf, avail);
+    memcpy(tmp_str, tmp_buf, avail);
 
-// Not implemented on all systems
+    // Not implemented on all systems
-// ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
+    // ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
-  found = FALSE;
+    found = FALSE;
-  for (ret=tmp_str;ret < (tmp_str+avail); ret++)
+    for (ret=tmp_str;ret < (tmp_str+avail); ret++)
-     if (*ret == '\n') {
+        if (*ret == '\n') 
-       found = TRUE;
+        {
-       break;
+            found = TRUE;
-     }
+            break;
+        }
 
-  if (!found)
+    if (!found)
-    return wxPROTO_PROTERR;
+        return wxPROTO_PROTERR;
-  *ret = 0;
+        
+    *ret = 0;
 
-  result = tmp_str;
+    result = wxString::FromAscii( tmp_str );
-  result = result.Left(result.Length()-1);
+    result = result.Left(result.Length()-1);
 
-  size = ret-tmp_str+1;
+    size = ret-tmp_str+1;
-  sock->Unread(&tmp_buf[size], avail-size);
+    sock->Unread(&tmp_buf[size], avail-size);
-  return wxPROTO_NOERR;
+  
+    return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
 #endif // wxUSE_SOCKETS

src/common/string.cpp

@@ -755,6 +755,16 @@ wxString wxString::FromAscii(const char *ascii)
     return res;
 }
 
+wxString wxString::FromAscii(const char ascii)
+{
+    // What do we do with '\0' ?
+
+    wxString res;
+    res += (wchar_t)(unsigned char) ascii;
+    
+    return res;
+}
+
 const wxCharBuffer wxString::ToAscii() const
 {
     // this will allocate enough space for the terminating NUL too