calLibraryのxml処理を共通化。

[tpi/lychee.git] / src / common / library / xmldoc.cpp

diff --git a/src/common/library/xmldoc.cpp b/src/common/library/xmldoc.cpp
index 13c67bd..b365a2a 100644 (file)
--- a/src/common/library/xmldoc.cpp
+++ b/src/common/library/xmldoc.cpp
@@ -58,10 +58,10 @@ wxXmlNode * myGetNextLib(wxXmlNode * n, int nLibIndex)
        return (n == NULL || myIsLib(n)) ? (nLibIndex <= 0 ? n : myGetNextLib(n, nLibIndex - 1)) : myGetNextLib(n, nLibIndex);\r
 }\r
 \r
-long myGetAttributeInt(wxXmlNode * n, const wxString & szValue, long nDefaultValue)\r
+wxULongLong_t myGetAttributeInt(wxXmlNode * n, const wxString & szValue, wxULongLong_t nDefaultValue, int nBase)\r
 {\r
-       long l;\r
-       n->GetAttribute(szValue, wxString::Format(wxT("%d"), nDefaultValue)).ToLong(& l, 16);\r
+       wxULongLong_t l;\r
+       n->GetAttribute(szValue, wxString::Format(wxString("%" wxLongLongFmtSpec "u"), nDefaultValue)).ToULongLong(& l, nBase);\r
        return l;\r
 }\r
 \r