many changes; major ones:
1. start of !wxUSE_GUI support 2. _T() macro renamed to T() 3. wxConvertWX2MB and MB2WX macro added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,7 +44,7 @@ void Skip_Comment(wxInputStream &stream)
|
||||
wxString line;
|
||||
wxTextInputStream text_stream(stream);
|
||||
|
||||
if (stream.Peek()==_T('#'))
|
||||
if (stream.Peek()==T('#'))
|
||||
{
|
||||
text_stream >> line;
|
||||
Skip_Comment(stream);
|
||||
@@ -68,19 +68,19 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
|
||||
wxTextInputStream text_stream(buf_stream);
|
||||
|
||||
Skip_Comment(buf_stream);
|
||||
if (buf_stream.GetC()==_T('P')) c=buf_stream.GetC();
|
||||
if (buf_stream.GetC()==T('P')) c=buf_stream.GetC();
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case _T('2'):
|
||||
wxLogError(_T("Loading Grey Ascii PNM image is not yet implemented."));
|
||||
case T('2'):
|
||||
wxLogError(T("Loading Grey Ascii PNM image is not yet implemented."));
|
||||
return FALSE;
|
||||
case _T('5'):
|
||||
wxLogError(_T("Loading Grey Raw PNM image is not yet implemented."));
|
||||
case T('5'):
|
||||
wxLogError(T("Loading Grey Raw PNM image is not yet implemented."));
|
||||
return FALSE;
|
||||
case _T('3'): case _T('6'): break;
|
||||
case T('3'): case T('6'): break;
|
||||
default :
|
||||
wxLogError(_T("Loading PNM image : file not recognized."));
|
||||
wxLogError(T("Loading PNM image : file not recognized."));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
|
||||
unsigned char *ptr = image->GetData();
|
||||
if (!ptr)
|
||||
{
|
||||
wxLogError( _T("Cannot allocate RAM for RGB data in PNM file.") );
|
||||
wxLogError( T("Cannot allocate RAM for RGB data in PNM file.") );
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
|
||||
|
||||
if (buf_stream.LastError()!=wxSTREAM_NOERROR)
|
||||
{
|
||||
wxLogError(_T("Loading PNM image : file seems truncated."));
|
||||
wxLogError(T("Loading PNM image : file seems truncated."));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@@ -143,10 +143,10 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
|
||||
|
||||
Skip_Comment(stream);
|
||||
|
||||
if (stream.GetC()==_T('P'))
|
||||
if (stream.GetC()==T('P'))
|
||||
switch (stream.GetC())
|
||||
{
|
||||
case _T('3'): case _T('6'):
|
||||
case T('3'): case T('6'):
|
||||
stream.SeekI(pos);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user