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

fixed initialization of standard IDs to happen before first use

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-05-31 22:31:13 +00:00
parent 34a246df34
commit 3b2a000ef5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/xrc/xmlres.cpp
View File

@@ -1455,8 +1455,18 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
return (*rec_var)->id; return (*rec_var)->id;
} }
static void AddStdXRCID_Records();
/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id) /*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
{ {
static bool s_stdIDsAdded = false;
if ( !s_stdIDsAdded )
{
s_stdIDsAdded = true;
AddStdXRCID_Records();
}
return XRCID_Lookup(str_id); return XRCID_Lookup(str_id);
} }
@@ -1601,7 +1611,6 @@ public:
wxXmlResourceModule() {} wxXmlResourceModule() {}
bool OnInit() bool OnInit()
{ {
AddStdXRCID_Records();
wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX); wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
return true; return true;
} }