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

allow to specify the value for unknown ids in GetXRCID() (patch 1448981)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-06 16:59:59 +00:00
parent 5625d0d4ca
commit 9b2a74693e
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xrc/xmlres.cpp
View File

@@ -1497,7 +1497,7 @@ struct XRCID_record
static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = wxID_NONE)
{
int index = 0;
@@ -1521,7 +1521,7 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
(*rec_var)->next = NULL;
wxChar *end;
if (value_if_not_found != -2)
if (value_if_not_found != wxID_NONE)
(*rec_var)->id = value_if_not_found;
else
{
@@ -1542,7 +1542,8 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
static void AddStdXRCID_Records();
/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
/*static*/
int wxXmlResource::GetXRCID(const wxChar *str_id, int value_if_not_found)
{
static bool s_stdIDsAdded = false;
@@ -1552,7 +1553,7 @@ static void AddStdXRCID_Records();
AddStdXRCID_Records();
}
return XRCID_Lookup(str_id);
return XRCID_Lookup(str_id, value_if_not_found);
}