replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code compiles and links fine on Solaris, runs with samples and Mahogany git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -54,7 +54,7 @@ wxFFile::wxFFile(const wxChar *filename, const char *mode)
|
||||
|
||||
bool wxFFile::Open(const wxChar *filename, const char *mode)
|
||||
{
|
||||
wxASSERT_MSG( !m_fp, T("should close or detach the old file first") );
|
||||
wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") );
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
char *tmp_fname;
|
||||
@@ -107,8 +107,8 @@ bool wxFFile::Close()
|
||||
|
||||
bool wxFFile::ReadAll(wxString *str)
|
||||
{
|
||||
wxCHECK_MSG( str, FALSE, T("invalid parameter") );
|
||||
wxCHECK_MSG( IsOpened(), FALSE, T("can't read from closed file") );
|
||||
wxCHECK_MSG( str, FALSE, wxT("invalid parameter") );
|
||||
wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") );
|
||||
|
||||
clearerr(m_fp);
|
||||
|
||||
@@ -137,8 +137,8 @@ bool wxFFile::ReadAll(wxString *str)
|
||||
|
||||
size_t wxFFile::Read(void *pBuf, size_t nCount)
|
||||
{
|
||||
wxCHECK_MSG( pBuf, FALSE, T("invalid parameter") );
|
||||
wxCHECK_MSG( IsOpened(), FALSE, T("can't read from closed file") );
|
||||
wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") );
|
||||
wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") );
|
||||
|
||||
size_t nRead = fread(pBuf, 1, nCount, m_fp);
|
||||
if ( (nRead < nCount) && Error() )
|
||||
@@ -151,8 +151,8 @@ size_t wxFFile::Read(void *pBuf, size_t nCount)
|
||||
|
||||
size_t wxFFile::Write(const void *pBuf, size_t nCount)
|
||||
{
|
||||
wxCHECK_MSG( pBuf, FALSE, T("invalid parameter") );
|
||||
wxCHECK_MSG( IsOpened(), FALSE, T("can't write to closed file") );
|
||||
wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") );
|
||||
wxCHECK_MSG( IsOpened(), FALSE, wxT("can't write to closed file") );
|
||||
|
||||
size_t nWritten = fwrite(pBuf, 1, nCount, m_fp);
|
||||
if ( nWritten < nCount )
|
||||
@@ -186,13 +186,13 @@ bool wxFFile::Flush()
|
||||
|
||||
bool wxFFile::Seek(long ofs, wxSeekMode mode)
|
||||
{
|
||||
wxCHECK_MSG( IsOpened(), FALSE, T("can't seek on closed file") );
|
||||
wxCHECK_MSG( IsOpened(), FALSE, wxT("can't seek on closed file") );
|
||||
|
||||
int origin;
|
||||
switch ( mode )
|
||||
{
|
||||
default:
|
||||
wxFAIL_MSG(T("unknown seek mode"));
|
||||
wxFAIL_MSG(wxT("unknown seek mode"));
|
||||
// still fall through
|
||||
|
||||
case wxFromStart:
|
||||
|
||||
Reference in New Issue
Block a user