// Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
+
#ifdef __GNUG__
#pragma implementation "xmlres.h"
#endif
wxXmlResource::wxXmlResource(bool use_locale)
{
- m_Handlers.DeleteContents(TRUE);
- m_UseLocale = use_locale;
+ m_handlers.DeleteContents(TRUE);
+ m_useLocale = use_locale;
+ m_version = -1;
}
-
+
wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale)
{
- m_UseLocale = use_locale;
- m_Handlers.DeleteContents(TRUE);
+ m_useLocale = use_locale;
+ m_version = -1;
+ m_handlers.DeleteContents(TRUE);
Load(filemask);
}
wxString fnd;
wxXmlResourceDataRecord *drec;
bool iswild = wxIsWild(filemask);
-
+ bool rt = TRUE;
+
#if wxUSE_FILESYSTEM
wxFileSystem fsys;
# define wxXmlFindFirst fsys.FindFirst(filemask, wxFILE)
if (filemask.Lower().Matches("*.zip") ||
filemask.Lower().Matches("*.rsc"))
{
- wxFileSystem fs2;
- wxString fnd2;
-
- fnd2 = fs2.FindFirst(fnd + wxT("#zip:*.xmb"), wxFILE);
- while (!!fnd2)
- {
- drec = new wxXmlResourceDataRecord;
- drec->File = fnd2;
- m_Data.Add(drec);
- fnd2 = fs2.FindNext();
- }
+ rt = rt && Load(fnd + wxT("#zip:*.xmb"));
+ rt = rt && Load(fnd + wxT("#zip:*.xrc"));
}
else
#endif
{
drec = new wxXmlResourceDataRecord;
drec->File = fnd;
- m_Data.Add(drec);
+ m_data.Add(drec);
}
if (iswild)
}
# undef wxXmlFindFirst
# undef wxXmlFindNext
- return TRUE;
+ return rt;
}
void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
{
- m_Handlers.Append(handler);
+ m_handlers.Append(handler);
handler->SetParentResource(this);
}
void wxXmlResource::ClearHandlers()
{
- m_Handlers.Clear();
+ m_handlers.Clear();
}
return rt;
}
+bool wxXmlResource::AttachUnknownControl(const wxString& name,
+ wxWindow *control, wxWindow *parent)
+{
+ if (parent == NULL)
+ parent = control->GetParent();
+ wxWindow *container = parent->FindWindow(name + wxT("_container"));
+ if (!container)
+ {
+ wxLogError(_("Cannot find container for unknown control '%s'."), name.c_str());
+ return FALSE;
+ }
+ return control->Reparent(container);
+}
void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
{
wxString s;
bool isok;
-
+
wxXmlNode *c = node->GetChildren();
while (c)
{
isok = FALSE;
- if (!c->GetPropVal(wxT("platform"), &s))
+ if (!c->GetPropVal(wxT("platform"), &s))
isok = TRUE;
else
{
while (tkn.HasMoreTokens())
{
- s = tkn.GetNextToken();
+ s = tkn.GetNextToken();
if (
#ifdef __WXMSW__
s == wxString(wxT("win"))
) isok = TRUE;
}
}
-
+
if (isok)
ProcessPlatformProperty(c);
else
node->RemoveChild(c);
delete c;
}
-
+
c = c->GetNext();
}
}
{
bool modif;
# if wxUSE_FILESYSTEM
- wxFSFile *file;
+ wxFSFile *file = NULL;
wxFileSystem fsys;
# endif
- for (size_t i = 0; i < m_Data.GetCount(); i++)
+ for (size_t i = 0; i < m_data.GetCount(); i++)
{
- modif = (m_Data[i].Doc == NULL);
+ modif = (m_data[i].Doc == NULL);
if (!modif)
{
# if wxUSE_FILESYSTEM
- file = fsys.OpenFile(m_Data[i].File);
- modif = file && file->GetModificationTime() > m_Data[i].Time;
+ file = fsys.OpenFile(m_data[i].File);
+ modif = file && file->GetModificationTime() > m_data[i].Time;
if (!file)
- wxLogError(_("Cannot open file '%s'."), m_Data[i].File.c_str());
- delete file;
+ wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());
+ wxDELETE(file);
# else
- modif = wxDateTime(wxFileModificationTime(m_Data[i].File)) > m_Data[i].Time;
+ modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
# endif
}
-
+
if (modif)
{
- wxInputStream *stream;
+ wxInputStream *stream = NULL;
# if wxUSE_FILESYSTEM
- file = fsys.OpenFile(m_Data[i].File);
- stream = file->GetStream();
+ file = fsys.OpenFile(m_data[i].File);
+ if (file)
+ stream = file->GetStream();
# else
- stream = new wxFileInputStream(m_Data[i].File);
+ stream = new wxFileInputStream(m_data[i].File);
# endif
-
- if (stream)
+
+ if (stream)
{
- delete m_Data[i].Doc;
- m_Data[i].Doc = new wxXmlDocument;
+ delete m_data[i].Doc;
+ m_data[i].Doc = new wxXmlDocument;
}
- if (!stream || !m_Data[i].Doc->Load(*stream))
+ if (!stream || !m_data[i].Doc->Load(*stream))
{
- wxLogError(_("Cannot load resources from file '%s'."), m_Data[i].File.c_str());
- delete m_Data[i].Doc;
- m_Data[i].Doc = NULL;
+ wxLogError(_("Cannot load resources from file '%s'."), m_data[i].File.c_str());
+ wxDELETE(m_data[i].Doc);
}
- else if (m_Data[i].Doc->GetRoot()->GetName() != wxT("resource"))
+ else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
{
- wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_Data[i].File.c_str());
- delete m_Data[i].Doc;
- m_Data[i].Doc = NULL;
+ wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str());
+ wxDELETE(m_data[i].Doc);
}
else
- ProcessPlatformProperty(m_Data[i].Doc->GetRoot());
+ {
+ long version;
+ int v1, v2, v3, v4;
+ wxString verstr = m_data[i].Doc->GetRoot()->GetPropVal(
+ wxT("version"), wxT("0.0.0.0"));
+ if (wxSscanf(verstr.c_str(), wxT("%i.%i.%i.%i"),
+ &v1, &v2, &v3, &v4) == 4)
+ version = v1*256*256*256+v2*256*256+v3*256+v4;
+ else
+ version = 0;
+ if (m_version == -1)
+ m_version = version;
+ if (m_version != version)
+ wxLogError(_("Resource files must have same version number!"));
+
+ ProcessPlatformProperty(m_data[i].Doc->GetRoot());
+ m_data[i].Time = file->GetModificationTime();
+ }
# if wxUSE_FILESYSTEM
- delete file;
+ wxDELETE(file);
# else
- delete stream;
+ wxDELETE(stream);
# endif
}
}
wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname)
{
UpdateResources(); //ensure everything is up-to-date
-
- wxString dummy;
- for (size_t f = 0; f < m_Data.GetCount(); f++)
+
+ wxString dummy;
+ for (size_t f = 0; f < m_data.GetCount(); f++)
{
- if (m_Data[f].Doc == NULL || m_Data[f].Doc->GetRoot() == NULL) continue;
- for (wxXmlNode *node = m_Data[f].Doc->GetRoot()->GetChildren();
+ if (m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL) continue;
+ for (wxXmlNode *node = m_data[f].Doc->GetRoot()->GetChildren();
node; node = node->GetNext())
if (node->GetType() == wxXML_ELEMENT_NODE &&
- (!classname ||
+ (!classname ||
node->GetPropVal(wxT("class"), wxEmptyString) == classname) &&
node->GetName() == wxT("object") &&
node->GetPropVal(wxT("name"), &dummy) &&
dummy == name)
{
#if wxUSE_FILESYSTEM
- m_CurFileSystem.ChangePathTo(m_Data[f].File);
+ m_curFileSystem.ChangePathTo(m_data[f].File);
#endif
return node;
}
}
- wxLogError(_("XML resource '%s' (class '%s') not found!"),
+ wxLogError(_("XML resource '%s' (class '%s') not found!"),
name.c_str(), classname.c_str());
return NULL;
}
wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance)
{
if (node == NULL) return NULL;
-
+
wxXmlResourceHandler *handler;
wxObject *ret;
- wxNode * ND = m_Handlers.GetFirst();
+ wxNode * ND = m_handlers.GetFirst();
while (ND)
{
handler = (wxXmlResourceHandler*)ND->GetData();
ND = ND->GetNext();
}
- wxLogError(_("No handler found for XML node '%s', class '%s'!"),
- node->GetName().c_str(),
+ wxLogError(_("No handler found for XML node '%s', class '%s'!"),
+ node->GetName().c_str(),
node->GetPropVal(wxT("class"), wxEmptyString).c_str());
return NULL;
}
wxXmlResourceHandler::wxXmlResourceHandler()
- : m_Node(NULL), m_Parent(NULL), m_Instance(NULL),
- m_ParentAsWindow(NULL), m_InstanceAsWindow(NULL)
+ : m_node(NULL), m_parent(NULL), m_instance(NULL),
+ m_parentAsWindow(NULL), m_instanceAsWindow(NULL)
{}
wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
{
- wxXmlNode *myNode = m_Node;
- wxString myClass = m_Class;
- wxObject *myParent = m_Parent, *myInstance = m_Instance;
- wxWindow *myParentAW = m_ParentAsWindow, *myInstanceAW = m_InstanceAsWindow;
-
- m_Node = node;
- m_Class = node->GetPropVal(wxT("class"), wxEmptyString);
- m_Parent = parent;
- m_Instance = instance;
- m_ParentAsWindow = wxDynamicCast(m_Parent, wxWindow);
- m_InstanceAsWindow = wxDynamicCast(m_Instance, wxWindow);
-
+ wxXmlNode *myNode = m_node;
+ wxString myClass = m_class;
+ wxObject *myParent = m_parent, *myInstance = m_instance;
+ wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow;
+
+ m_node = node;
+ m_class = node->GetPropVal(wxT("class"), wxEmptyString);
+ m_parent = parent;
+ m_instance = instance;
+ m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
+ m_instanceAsWindow = wxDynamicCast(m_instance, wxWindow);
+
wxObject *returned = DoCreateResource();
-
- m_Node = myNode;
- m_Class = myClass;
- m_Parent = myParent; m_ParentAsWindow = myParentAW;
- m_Instance = myInstance; m_InstanceAsWindow = myInstanceAW;
-
+
+ m_node = myNode;
+ m_class = myClass;
+ m_parent = myParent; m_parentAsWindow = myParentAW;
+ m_instance = myInstance; m_instanceAsWindow = myInstanceAW;
+
return returned;
}
void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
{
- m_StyleNames.Add(name);
- m_StyleValues.Add(value);
+ m_styleNames.Add(name);
+ m_styleValues.Add(value);
}
ADD_STYLE(wxDOUBLE_BORDER);
ADD_STYLE(wxRAISED_BORDER);
ADD_STYLE(wxSTATIC_BORDER);
+ ADD_STYLE(wxNO_BORDER);
ADD_STYLE(wxTRANSPARENT_WINDOW);
ADD_STYLE(wxWANTS_CHARS);
ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
{
wxString s = GetParamValue(param);
-
+
if (!s) return defaults;
-
+
wxStringTokenizer tkn(s, wxT("| "), wxTOKEN_STRTOK);
int style = 0;
int index;
while (tkn.HasMoreTokens())
{
fl = tkn.GetNextToken();
- index = m_StyleNames.Index(fl);
+ index = m_styleNames.Index(fl);
if (index != wxNOT_FOUND)
- style |= m_StyleValues[index];
+ style |= m_styleValues[index];
else
wxLogError(_("Unknown style flag ") + fl);
}
wxString str1 = GetParamValue(param);
wxString str2;
const wxChar *dt;
+ wxChar amp_char;
+
+ // VS: First version of XML resources used $ instead of & (which is illegal in XML),
+ // but later I realized that '_' fits this purpose much better (because
+ // &File means "File with F underlined").
+ if (m_resource->CompareVersion(2,3,0,1) < 0)
+ amp_char = wxT('$');
+ else
+ amp_char = wxT('_');
for (dt = str1.c_str(); *dt; dt++)
{
- // Remap $ to &, map $$ to $ (for things like "&File..." --
- // this is illegal in XML, so we use "$File..."):
- if (*dt == '$')
- switch (*(++dt))
- {
- case '$' : str2 << '$'; break;
- default : str2 << '&' << *dt; break;
- }
- // Remap \n to CR, \r LF, \t to TAB:
- else if (*dt == '\\')
+ // Remap amp_char to &, map double amp_char to amp_char (for things
+ // like "&File..." -- this is illegal in XML, so we use "_File..."):
+ if (*dt == amp_char)
+ {
+ if ( *(++dt) == amp_char )
+ str2 << amp_char;
+ else
+ str2 << wxT('&') << *dt;
+ }
+ // Remap \n to CR, \r to LF, \t to TAB:
+ else if (*dt == wxT('\\'))
switch (*(++dt))
{
- case 'n' : str2 << '\n'; break;
- case 't' : str2 << '\t'; break;
- case 'r' : str2 << '\r'; break;
- default : str2 << '\\' << *dt; break;
+ case wxT('n') : str2 << wxT('\n'); break;
+ case wxT('t') : str2 << wxT('\t'); break;
+ case wxT('r') : str2 << wxT('\r'); break;
+ default : str2 << wxT('\\') << *dt; break;
}
else str2 << *dt;
}
-
- if (m_Resource->GetUseLocale())
+
+ if (m_resource->GetUseLocale())
return wxGetTranslation(str2);
else
return str2;
long value;
wxString str1 = GetParamValue(param);
- if (!str1.ToLong(&value))
+ if (!str1.ToLong(&value))
value = defaultv;
return value;
{
wxString sid = GetName();
long num;
-
+
if (sid == wxT("-1")) return -1;
else if (sid.IsNumber() && sid.ToLong(&num)) return num;
#define stdID(id) else if (sid == wxT(#id)) return id
stdID(wxID_EXIT); stdID(wxID_UNDO); stdID(wxID_REDO);
stdID(wxID_HELP); stdID(wxID_PRINT); stdID(wxID_PRINT_SETUP);
stdID(wxID_PREVIEW); stdID(wxID_ABOUT); stdID(wxID_HELP_CONTENTS);
- stdID(wxID_HELP_COMMANDS); stdID(wxID_HELP_PROCEDURES);
- stdID(wxID_CUT); stdID(wxID_COPY); stdID(wxID_PASTE);
+ stdID(wxID_HELP_COMMANDS); stdID(wxID_HELP_PROCEDURES);
+ stdID(wxID_CUT); stdID(wxID_COPY); stdID(wxID_PASTE);
stdID(wxID_CLEAR); stdID(wxID_FIND); stdID(wxID_DUPLICATE);
stdID(wxID_SELECTALL); stdID(wxID_OK); stdID(wxID_CANCEL);
stdID(wxID_APPLY); stdID(wxID_YES); stdID(wxID_NO);
stdID(wxID_STATIC); stdID(wxID_FORWARD); stdID(wxID_BACKWARD);
stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
- stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
+ stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
#undef stdID
else return XMLID(sid.c_str());
}
wxString wxXmlResourceHandler::GetName()
{
- return m_Node->GetPropVal(wxT("name"), wxT("-1"));
+ return m_node->GetPropVal(wxT("name"), wxT("-1"));
}
wxColour wxXmlResourceHandler::GetColour(const wxString& param)
{
wxString v = GetParamValue(param);
- unsigned long tmp = 0;
-
+ unsigned long tmp = 0;
+
if (v.Length() != 7 || v[0u] != wxT('#') ||
wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1)
{
v.c_str(), param.c_str());
return wxNullColour;
}
-
- return wxColour((tmp & 0xFF0000) >> 16 ,
- (tmp & 0x00FF00) >> 8,
+
+ return wxColour((tmp & 0xFF0000) >> 16 ,
+ (tmp & 0x00FF00) >> 8,
(tmp & 0x0000FF));
}
{
wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
return wxNullBitmap;
- }
+ }
wxImage img(*(fsfile->GetStream()));
delete fsfile;
#else
wxImage img(GetParamValue(wxT("bitmap")));
#endif
- if (!img.Ok())
+ if (!img.Ok())
{
wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
return wxNullBitmap;
wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
{
- wxXmlNode *n = m_Node->GetChildren();
-
+ wxXmlNode *n = m_node->GetChildren();
+
while (n)
{
if (n->GetType() == wxXML_ELEMENT_NODE && n->GetName() == param)
wxXmlNode *n = node;
if (n == NULL) return wxEmptyString;
n = n->GetChildren();
-
+
while (n)
{
- if (n->GetType() == wxXML_TEXT_NODE ||
+ if (n->GetType() == wxXML_TEXT_NODE ||
n->GetType() == wxXML_CDATA_SECTION_NODE)
return n->GetContent();
n = n->GetNext();
wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
{
if (param.IsEmpty())
- return GetNodeContent(m_Node);
+ return GetNodeContent(m_node);
else
return GetNodeContent(GetParamNode(param));
}
if (s.IsEmpty()) s = wxT("-1,-1");
bool is_dlg;
long sx, sy;
-
+
is_dlg = s[s.Length()-1] == wxT('d');
if (is_dlg) s.RemoveLast();
-
+
if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||
!s.AfterLast(wxT(',')).ToLong(&sy))
{
wxLogError(_("Cannot parse coordinates from '%s'."), s.mb_str());
return wxDefaultSize;
}
-
+
if (is_dlg)
{
- if (m_InstanceAsWindow)
- return wxDLG_UNIT(m_InstanceAsWindow, wxSize(sx, sy));
- else if (m_ParentAsWindow)
- return wxDLG_UNIT(m_ParentAsWindow, wxSize(sx, sy));
+ if (m_instanceAsWindow)
+ return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, sy));
+ else if (m_parentAsWindow)
+ return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));
else
{
wxLogError(_("Cannot convert dialog units: dialog unknown."));
if (s.IsEmpty()) return defaultv;
bool is_dlg;
long sx;
-
+
is_dlg = s[s.Length()-1] == wxT('d');
if (is_dlg) s.RemoveLast();
-
+
if (!s.ToLong(&sx))
{
wxLogError(_("Cannot parse dimension from '%s'."), s.mb_str());
return defaultv;
}
-
+
if (is_dlg)
{
- if (m_InstanceAsWindow)
- return wxDLG_UNIT(m_InstanceAsWindow, wxSize(sx, 0)).x;
- else if (m_ParentAsWindow)
- return wxDLG_UNIT(m_ParentAsWindow, wxSize(sx, 0)).x;
+ if (m_instanceAsWindow)
+ return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, 0)).x;
+ else if (m_parentAsWindow)
+ return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x;
else
{
wxLogError(_("Cannot convert dialog units: dialog unknown."));
wxFont wxXmlResourceHandler::GetFont(const wxString& param)
-{
+{
wxXmlNode *font_node = GetParamNode(param);
if (font_node == NULL)
{
wxLogError(_("Cannot find font node '%s'."), param.mb_str());
return wxNullFont;
}
-
- wxXmlNode *oldnode = m_Node;
- m_Node = font_node;
+
+ wxXmlNode *oldnode = m_node;
+ m_node = font_node;
long size = GetLong(wxT("size"), 12);
wxString style = GetParamValue(wxT("style"));
wxString weight = GetParamValue(wxT("weight"));
- int istyle = wxNORMAL, iweight = wxNORMAL;
+ int istyle = wxNORMAL, iweight = wxNORMAL;
if (style == wxT("italic")) istyle = wxITALIC;
else if (style == wxT("slant")) istyle = wxSLANT;
if (weight == wxT("bold")) iweight = wxBOLD;
wxFontEnumerator enu;
enu.EnumerateFacenames();
wxStringTokenizer tk(faces, wxT(","));
- while (tk.HasMoreTokens())
+ while (tk.HasMoreTokens())
{
int index = enu.GetFacenames()->Index(tk.GetNextToken(), FALSE);
- if (index != wxNOT_FOUND)
+ if (index != wxNOT_FOUND)
{
facename = (*enu.GetFacenames())[index];
break;
}
}
-
- m_Node = oldnode;
-
+
+ m_node = oldnode;
+
wxFont font(size, ifamily, istyle, iweight, underlined, facename, enc);
return font;
}
void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
{
//FIXME : add cursor
-
+
if (HasParam(wxT("exstyle")))
wnd->SetExtraStyle(GetStyle(wxT("exstyle")));
if (HasParam(wxT("bg")))
#if wxUSE_TOOLTIPS
if (HasParam(wxT("tooltip")))
wnd->SetToolTip(GetText(wxT("tooltip")));
-#endif
+#endif
if (HasParam(wxT("font")))
wnd->SetFont(GetFont());
}
void wxXmlResourceHandler::CreateChildren(wxObject *parent, bool this_hnd_only)
{
- wxXmlNode *n = m_Node->GetChildren();
+ wxXmlNode *n = m_node->GetChildren();
while (n)
{
if (n->GetType() == wxXML_ELEMENT_NODE &&
n->GetName() == wxT("object"))
- {
+ {
if (this_hnd_only && CanHandle(n))
CreateResource(n, parent, NULL);
else
- m_Resource->CreateResFromNode(n, parent, NULL);
+ m_resource->CreateResFromNode(n, parent, NULL);
}
n = n->GetNext();
}
void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode)
{
wxXmlNode *root;
- if (rootnode == NULL) root = m_Node; else root = rootnode;
+ if (rootnode == NULL) root = m_node; else root = rootnode;
wxXmlNode *n = root->GetChildren();
while (n)
-
-
// --------------- XMLID implementation -----------------------------
#define XMLID_TABLE_SIZE 1024
/*static*/ int wxXmlResource::GetXMLID(const char *str_id)
{
static int XMLID_LastID = wxID_HIGHEST;
-
+
int index = 0;
-
+
for (const char *c = str_id; *c != '\0'; c++) index += (int)*c;
index %= XMLID_TABLE_SIZE;
-
+
XMLID_record *oldrec = NULL;
int matchcnt = 0;
for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
matchcnt++;
oldrec = rec;
}
-
- XMLID_record **rec_var = (oldrec == NULL) ?
+
+ XMLID_record **rec_var = (oldrec == NULL) ?
&XMLID_Records[index] : &oldrec->next;
*rec_var = new XMLID_record;
(*rec_var)->id = ++XMLID_LastID;
(*rec_var)->key = strdup(str_id);
(*rec_var)->next = NULL;
-
+
return (*rec_var)->id;
}
public:
wxXmlResourceModule() {}
bool OnInit() {return TRUE;}
- void OnExit()
+ void OnExit()
{
wxTheXmlResource->ClearHandlers();
CleanXMLID_Records();
};
IMPLEMENT_DYNAMIC_CLASS(wxXmlResourceModule, wxModule)
+
+
+// When wxXml is loaded dynamically after the application is already running
+// then the built-in module system won't pick this one up. Add it manually.
+void wxXmlInitResourceModule()
+{
+ wxModule* module = new wxXmlResourceModule;
+ module->Init();
+ wxModule::RegisterModule(module);
+}
+
+
projects / wxWidgets.git / blobdiff