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

blind fix for wxMotif compilation with wxHAVE_LIB_XPM == 0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-04-25 11:10:45 +00:00
parent c5a2f27478
commit 0cad49b42c
1 changed files with 152 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/x11/bitmap.cpp
View File

@@ -1357,12 +1357,9 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
if (stream.Ok()) if (stream.Ok())
{ {
wxImage image(decoder.ReadFile(stream)); wxImage image(decoder.ReadFile(stream));
if (image.Ok()) return image.Ok() && bitmap->CreateFromImage(image);
return CreateFromImage(image);
else
return FALSE;
} }
else #else // !wxHAVE_LIB_XPM && !wxUSE_STREAMS
return FALSE; return FALSE;
#endif // wxHAVE_LIB_XPM / wxUSE_STREAMS #endif // wxHAVE_LIB_XPM / wxUSE_STREAMS
} }
@@ -1471,14 +1468,11 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
return FALSE; return FALSE;
} }
#else #else // !wxHAVE_LIB_XPM
wxXPMDecoder decoder; wxXPMDecoder decoder;
wxImage image(decoder.ReadData(bits)); wxImage image(decoder.ReadData((const char **)bits));
if (image.Ok()) return image.Ok() && bitmap->CreateFromImage(image);
return bitmap->CreateFromImage(image); #endif // wxHAVE_LIB_XPM/!wxHAVE_LIB_XPM
else
return FALSE;
#endif
} }
#endif // wxUSE_XPM #endif // wxUSE_XPM