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

fixed XRCID() lookup of numeric control IDs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-12-26 23:36:34 +00:00
parent ba5da12f72
commit 85452d7496
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/src/xrc/xmlres.cpp
View File

@@ -1181,10 +1181,21 @@ static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
XRCID_record **rec_var = (oldrec == NULL) ? XRCID_record **rec_var = (oldrec == NULL) ?
&XRCID_Records[index] : &oldrec->next; &XRCID_Records[index] : &oldrec->next;
*rec_var = new XRCID_record; *rec_var = new XRCID_record;
(*rec_var)->id = ++XRCID_LastID;
(*rec_var)->key = wxStrdup(str_id); (*rec_var)->key = wxStrdup(str_id);
(*rec_var)->next = NULL; (*rec_var)->next = NULL;
wxChar *end;
int asint = wxStrtol(str_id, &end, 10);
if (*str_id && *end == 0)
{
// if str_id was integer, keep it verbosely:
(*rec_var)->id = asint;
}
else
{
(*rec_var)->id = ++XRCID_LastID;
}
return (*rec_var)->id; return (*rec_var)->id;
} }

13
src/xrc/xmlres.cpp
View File

@@ -1181,10 +1181,21 @@ static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
XRCID_record **rec_var = (oldrec == NULL) ? XRCID_record **rec_var = (oldrec == NULL) ?
&XRCID_Records[index] : &oldrec->next; &XRCID_Records[index] : &oldrec->next;
*rec_var = new XRCID_record; *rec_var = new XRCID_record;
(*rec_var)->id = ++XRCID_LastID;
(*rec_var)->key = wxStrdup(str_id); (*rec_var)->key = wxStrdup(str_id);
(*rec_var)->next = NULL; (*rec_var)->next = NULL;
wxChar *end;
int asint = wxStrtol(str_id, &end, 10);
if (*str_id && *end == 0)
{
// if str_id was integer, keep it verbosely:
(*rec_var)->id = asint;
}
else
{
(*rec_var)->id = ++XRCID_LastID;
}
return (*rec_var)->id; return (*rec_var)->id;
} }