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

replace use of 'long/int bitmapType' with 'wxBitmapType bitmapType' in richtext and wxMemoryFSHandler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-05-10 09:40:33 +00:00
parent 21864ff2a1
commit d75a69e832
8 changed files with 68 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/richtext/richtextxml.cpp
View File

@@ -172,10 +172,18 @@ bool wxRichTextXMLHandler::ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node)
}
else if (childName == wxT("image"))
{
int imageType = wxBITMAP_TYPE_PNG;
wxBitmapType imageType = wxBITMAP_TYPE_PNG;
wxString value = node->GetAttribute(wxT("imagetype"), wxEmptyString);
if (!value.empty())
imageType = wxAtoi(value);
{
int type = wxAtoi(value);
// note: 0 == wxBITMAP_TYPE_INVALID
if (type <= 0 || type >= wxBITMAP_TYPE_MAX)
wxLogWarning("Invalid bitmap type specified for <image> tag: %d", type);
else
imageType = (wxBitmapType)type;
}
wxString data;