Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed indentation and warnings/bugs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-14 15:16:45 +00:00
parent 63dfa4e56c
commit 6c28fd3379
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/image.cpp
View File

@@ -766,15 +766,18 @@ bool wxImage::LoadFile( const wxString& filename, long type )
// We want to use wxFileSystem for virtual FS compatibility // We want to use wxFileSystem for virtual FS compatibility
wxFileSystem fsys; wxFileSystem fsys;
wxFSFile *file = fsys.OpenFile(filename); wxFSFile *file = fsys.OpenFile(filename);
if (!file) { if (!file)
wxLogError(_("Can't open file '%s'"), filename); {
wxLogError(_("Can't open file '%s'"), filename.c_str());
return FALSE; return FALSE;
} }
wxInputStream *stream = file->GetStream(); wxInputStream *stream = file->GetStream();
if (!stream) { if (!stream)
wxLogError(_("Can't open stream for file '%s'"), filename); {
wxLogError(_("Can't open stream for file '%s'"), filename.c_str());
return FALSE; return FALSE;
} }
return LoadFile(*stream, type); return LoadFile(*stream, type);
#else // !wxUSE_STREAMS #else // !wxUSE_STREAMS
return FALSE; return FALSE;
@@ -787,13 +790,15 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
// We want to use wxFileSystem for virtual FS compatibility // We want to use wxFileSystem for virtual FS compatibility
wxFileSystem fsys; wxFileSystem fsys;
wxFSFile *file = fsys.OpenFile(filename); wxFSFile *file = fsys.OpenFile(filename);
if (!file) { if (!file)
wxLogError(_("Can't open file '%s'"), filename); {
wxLogError(_("Can't open file '%s'"), filename.c_str());
return FALSE; return FALSE;
} }
wxInputStream *stream = file->GetStream(); wxInputStream *stream = file->GetStream();
if (!stream) { if (!stream)
wxLogError(_("Can't open stream for file '%s'"), filename); {
wxLogError(_("Can't open stream for file '%s'"), filename.c_str());
return FALSE; return FALSE;
} }
return LoadFile(*stream, mimetype); return LoadFile(*stream, mimetype);