Use common inline version of wxHexToDec
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -252,6 +252,25 @@ WXDLLIMPEXP_BASE long wxNewId();
|
||||
// Convert 2-digit hex number to decimal
|
||||
WXDLLIMPEXP_BASE int wxHexToDec(const wxString& buf);
|
||||
|
||||
// Convert 2-digit hex number to decimal
|
||||
inline int wxHexToDec(const char* buf)
|
||||
{
|
||||
int firstDigit, secondDigit;
|
||||
|
||||
if (buf[0] >= 'A')
|
||||
firstDigit = buf[0] - 'A' + 10;
|
||||
else
|
||||
firstDigit = buf[0] - '0';
|
||||
|
||||
if (buf[1] >= 'A')
|
||||
secondDigit = buf[1] - 'A' + 10;
|
||||
else
|
||||
secondDigit = buf[1] - '0';
|
||||
|
||||
return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
|
||||
}
|
||||
|
||||
|
||||
// Convert decimal integer to 2-character hex string
|
||||
WXDLLIMPEXP_BASE void wxDecToHex(int dec, wxChar *buf);
|
||||
WXDLLIMPEXP_BASE void wxDecToHex(int dec, char* ch1, char* ch2);
|
||||
|
Reference in New Issue
Block a user