More fixes to make Borland compile this in Unicode mode.

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

diff --git a/src/common/date.cpp b/src/common/date.cpp
index c8cd9dda8b8c2303d6ce8b32bb14d42ba9da49a9..04d7fdbcb90120bd82848f54b975c474a23ee12d 100644 (file)
--- a/src/common/date.cpp
+++ b/src/common/date.cpp
@@ -282,7 +282,7 @@ bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2)
 
 ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
 {
-    return os << (const wxChar *) dt.FormatDate();
+    return os << dt.FormatDate().mb_str();
 }
 
 //////////////////////////////////////////////////////////////

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index d4ae328d0fcb31a1073b1f0558701b1f00105c7b..a4487f8df08572220a6d66bce81f784d0f68272d 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -30,7 +30,7 @@
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFileProto, "file", NULL, FALSE)
+IMPLEMENT_PROTOCOL(wxFileProto, _T("file"), NULL, FALSE)
 #endif
 
 wxFileProto::wxFileProto()

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index d3268834b23ce4cb177414e3714c5c210460ac10..8c576605c1a462c9b0c7588df02694cf451925b8 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1606,7 +1606,7 @@ void wxMacSocketHandlerProc( void *refcon , short event )
 #endif
 #ifdef __WINDOWS__
 
-extern char wxPanelClassName[];
+extern wxChar wxPanelClassName[];
 
 LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
    WPARAM wParam, LPARAM lParam)
@@ -1645,7 +1645,7 @@ LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
     break;
 
   default:
-      wxFAIL_MSG("invalid socket event");
+      wxFAIL_MSG(_T("invalid socket event"));
       return (LRESULT)0;
   }
 

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 9c012d1602049c2057f1105619c0d715d44fbb43..ef280923ab5553bd5b0ae68e3756127295731b90 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -109,7 +109,7 @@ bool wxURL::ParseURL()
 
 void wxURL::CleanData()
 {
-  if (m_protoname != "proxy")
+  if (m_protoname != _T("proxy"))
     delete m_protocol;
 }
 
@@ -239,7 +239,7 @@ wxInputStream *wxURL::GetInputStream(void)
   }
 
   m_error = wxURL_NOERR;
-  if (m_user != "") {
+  if (m_user != _T("")) {
     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }