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
This commit is contained in:
parent
20fd9757ff
commit
0042120682
@ -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();
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////
|
||||
|
@ -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()
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user