1. wxImageHandler::DoCanRead() introduced to solve the virtual function name
hiding problem 2. wxPNMHandler::CanRead() shouldn't use wxT() - should it? git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -401,10 +401,10 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool wxBMPHandler::CanRead( wxInputStream& stream )
|
||||
bool wxBMPHandler::DoCanRead( wxInputStream& stream )
|
||||
{
|
||||
unsigned char hdr[2];
|
||||
|
||||
|
||||
stream.Read(&hdr, 2);
|
||||
stream.SeekI(-2, wxFromCurrent);
|
||||
return (hdr[0] == 'B' && hdr[1] == 'M');
|
||||
|
Reference in New Issue
Block a user