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

Dialog unit mods; wxProp tidying

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-10-09 12:01:58 +00:00
parent c39d4bcf2b
commit fd71308fc8
57 changed files with 2060 additions and 1850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/utilscmn.cpp
View File

@@ -240,19 +240,19 @@ static char hexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A'
'C', 'D', 'E', 'F' };
// Convert 2-digit hex number to decimal
int wxHexToDec(char *buf)
int wxHexToDec(const wxString& buf)
{
int firstDigit, secondDigit;
if (buf[0] >= 'A')
firstDigit = buf[0] - 'A' + 10;
if (buf.GetChar(0) >= 'A')
firstDigit = buf.GetChar(0) - 'A' + 10;
else
firstDigit = buf[0] - '0';
firstDigit = buf.GetChar(0) - '0';
if (buf[1] >= 'A')
secondDigit = buf[1] - 'A' + 10;
if (buf.GetChar(1) >= 'A')
secondDigit = buf.GetChar(1) - 'A' + 10;
else
secondDigit = buf[1] - '0';
secondDigit = buf.GetChar(1) - '0';
return firstDigit * 16 + secondDigit;
}
@@ -267,6 +267,14 @@ void wxDecToHex(int dec, char *buf)
buf[2] = 0;
}
// Convert decimal integer to 2-character hex string
wxString wxDecToHex(int dec)
{
char buf[3];
wxDecToHex(dec, buf);
return wxString(buf);
}
// Match a string INDEPENDENT OF CASE
bool
StringMatch (char *str1, char *str2, bool subString, bool exact)