/////////////////////////////////////////////////////////////////////////////
// Name: xmlres.cpp
-// Purpose: XML resources
+// Purpose: XRC resources
// Author: Vaclav Slavik
// Created: 2000/03/05
// RCS-ID: $Id$
#include "wx/bitmap.h"
#include "wx/image.h"
#include "wx/fontmap.h"
+#include "wx/artprov.h"
#include "wx/xrc/xml.h"
#include "wx/xrc/xmlres.h"
WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
-wxXmlResource::wxXmlResource(bool use_locale)
+wxXmlResource *wxXmlResource::ms_instance = NULL;
+
+/*static*/ wxXmlResource *wxXmlResource::Get()
+{
+ if ( !ms_instance )
+ ms_instance = new wxXmlResource;
+ return ms_instance;
+}
+
+/*static*/ wxXmlResource *wxXmlResource::Set(wxXmlResource *res)
+{
+ wxXmlResource *old = ms_instance;
+ ms_instance = res;
+ return old;
+}
+
+wxXmlResource::wxXmlResource(int flags)
{
m_handlers.DeleteContents(TRUE);
- m_useLocale = use_locale;
+ m_flags = flags;
m_version = -1;
}
-wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale)
+wxXmlResource::wxXmlResource(const wxString& filemask, int flags)
{
- m_useLocale = use_locale;
+ m_flags = flags;
m_version = -1;
m_handlers.DeleteContents(TRUE);
Load(filemask);
while (!!fnd)
{
#if wxUSE_FILESYSTEM
- if (filemask.Lower().Matches("*.zip") ||
- filemask.Lower().Matches("*.rsc"))
+ if (filemask.Lower().Matches(wxT("*.zip")) ||
+ filemask.Lower().Matches(wxT("*.xrs")))
{
- rt = rt && Load(fnd + wxT("#zip:*.xmb"));
rt = rt && Load(fnd + wxT("#zip:*.xrc"));
}
else
handler->SetParentResource(this);
}
+void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
+{
+ m_handlers.Insert(handler);
+ handler->SetParentResource(this);
+}
+
void wxXmlResource::ClearHandlers()
}
-
wxMenu *wxXmlResource::LoadMenu(const wxString& name)
{
return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);
-wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name)
+wxMenuBar *wxXmlResource::LoadMenuBar(wxWindow *parent, const wxString& name)
{
- return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), NULL, NULL);
+ return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), parent, NULL);
}
+#if wxUSE_TOOLBAR
wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
{
return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("wxToolBar")), parent, NULL);
}
-
+#endif
wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
{
- wxDialog *dialog = new wxDialog;
- if (!LoadDialog(dialog, parent, name))
- { delete dialog; return NULL; }
- else return dialog;
+ return (wxDialog*)CreateResFromNode(FindResource(name, wxT("wxDialog")), parent, NULL);
}
bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)
return CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, panel) != NULL;
}
+wxFrame *wxXmlResource::LoadFrame(wxWindow* parent, const wxString& name)
+{
+ return (wxFrame*)CreateResFromNode(FindResource(name, wxT("wxFrame")), parent, NULL);
+}
+
bool wxXmlResource::LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name)
{
return CreateResFromNode(FindResource(name, wxT("wxFrame")), parent, frame) != NULL;
return rt;
}
+
+wxObject *wxXmlResource::LoadObject(wxWindow *parent, const wxString& name, const wxString& classname)
+{
+ return CreateResFromNode(FindResource(name, classname), parent, NULL);
+}
+
+bool wxXmlResource::LoadObject(wxObject *instance, wxWindow *parent, const wxString& name, const wxString& classname)
+{
+ return CreateResFromNode(FindResource(name, classname), parent, instance) != NULL;
+}
+
+
bool wxXmlResource::AttachUnknownControl(const wxString& name,
wxWindow *control, wxWindow *parent)
{
}
-void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
+static void ProcessPlatformProperty(wxXmlNode *node)
{
wxString s;
bool isok;
isok = TRUE;
else
{
- wxStringTokenizer tkn(s, " |");
+ wxStringTokenizer tkn(s, wxT(" |"));
while (tkn.HasMoreTokens())
{
}
if (isok)
+ {
ProcessPlatformProperty(c);
+ c = c->GetNext();
+ }
else
{
+ wxXmlNode *c2 = c->GetNext();
node->RemoveChild(c);
delete c;
+ c = c2;
}
-
- c = c->GetNext();
}
}
wxFileSystem fsys;
# endif
+ wxString encoding(wxT("UTF-8"));
+#if !wxUSE_UNICODE && wxUSE_INTL
+ if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
+ {
+ // In case we are not using wxLocale to translate strings, convert the strings
+ // GUI's charset. This must not be done when wxXRC_USE_LOCALE is on, because
+ // it could break wxGetTranslation lookup.
+ encoding = wxLocale::GetSystemEncodingName();
+ }
+#endif
+
for (size_t i = 0; i < m_data.GetCount(); i++)
{
modif = (m_data[i].Doc == NULL);
if (modif)
{
- wxInputStream *stream = NULL;
+ wxInputStream *stream = NULL;
# if wxUSE_FILESYSTEM
file = fsys.OpenFile(m_data[i].File);
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, encoding))
{
- wxLogError(_("Cannot load resources from file '%s'."), m_data[i].File.c_str());
+ 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"))
{
- wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str());
+ wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str());
wxDELETE(m_data[i].Doc);
}
else
}
+wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
+ const wxString& name,
+ const wxString& classname,
+ bool recursive)
+{
+ wxString dummy;
+ wxXmlNode *node;
+
+ // first search for match at the top-level nodes (as this is
+ // where the resource is most commonly looked for):
+ for (node = parent->GetChildren(); node; node = node->GetNext())
+ {
+ if ( node->GetType() == wxXML_ELEMENT_NODE &&
+ (node->GetName() == wxT("object") ||
+ node->GetName() == wxT("object_ref")) &&
+ node->GetPropVal(wxT("name"), &dummy) && dummy == name )
+ {
+ wxString cls(node->GetPropVal(wxT("class"), wxEmptyString));
+ if (!classname || cls == classname)
+ return node;
+ // object_ref may not have 'class' property:
+ if (cls.empty() && node->GetName() == wxT("object_ref"))
+ {
+ wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
+ if (refName.empty())
+ continue;
+ wxXmlNode* refNode = FindResource(refName, wxEmptyString, TRUE);
+ if (refNode &&
+ refNode->GetPropVal(wxT("class"), wxEmptyString) == classname)
+ {
+ return node;
+ }
+ }
+ }
+ }
+
+ if ( recursive )
+ for (node = parent->GetChildren(); node; node = node->GetNext())
+ {
+ if ( node->GetType() == wxXML_ELEMENT_NODE &&
+ (node->GetName() == wxT("object") ||
+ node->GetName() == wxT("object_ref")) )
+ {
+ wxXmlNode* found = DoFindResource(node, name, classname, TRUE);
+ if ( found )
+ return found;
+ }
+ }
-wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname)
+ return NULL;
+}
+
+wxXmlNode *wxXmlResource::FindResource(const wxString& name,
+ const wxString& classname,
+ bool recursive)
{
UpdateResources(); //ensure everything is up-to-date
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();
- node; node = node->GetNext())
- if (node->GetType() == wxXML_ELEMENT_NODE &&
- (!classname ||
- node->GetPropVal(wxT("class"), wxEmptyString) == classname) &&
- node->GetName() == wxT("object") &&
- node->GetPropVal(wxT("name"), &dummy) &&
- dummy == name)
- {
+ if ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL )
+ continue;
+
+ wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(),
+ name, classname, recursive);
+ if ( found )
+ {
#if wxUSE_FILESYSTEM
- m_curFileSystem.ChangePathTo(m_data[f].File);
+ m_curFileSystem.ChangePathTo(m_data[f].File);
#endif
- return node;
- }
+ return found;
+ }
}
- wxLogError(_("XML resource '%s' (class '%s') not found!"),
+ wxLogError(_("XRC resource '%s' (class '%s') not found!"),
name.c_str(), classname.c_str());
return NULL;
}
+static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
+{
+ // Merge properties:
+ for (wxXmlProperty *prop = with.GetProperties(); prop; prop = prop->GetNext())
+ {
+ wxXmlProperty *dprop;
+ for (dprop = dest.GetProperties(); dprop; dprop = dprop->GetNext())
+ {
+
+ if ( dprop->GetName() == prop->GetName() )
+ {
+ dprop->SetValue(prop->GetValue());
+ break;
+ }
+ }
+
+ if ( !dprop )
+ dest.AddProperty(prop->GetName(), prop->GetValue());
+ }
+
+ // Merge child nodes:
+ for (wxXmlNode* node = with.GetChildren(); node; node = node->GetNext())
+ {
+ wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+ wxXmlNode *dnode;
+
+ for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() )
+ {
+ if ( dnode->GetName() == node->GetName() &&
+ dnode->GetPropVal(wxT("name"), wxEmptyString) == name &&
+ dnode->GetType() == node->GetType() )
+ {
+ MergeNodes(*dnode, *node);
+ break;
+ }
+ }
+
+ if ( !dnode )
+ dest.AddChild(new wxXmlNode(*node));
+ }
+ if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
+ dest.SetContent(with.GetContent());
+}
wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance)
{
if (node == NULL) return NULL;
+ // handling of referenced resource
+ if ( node->GetName() == wxT("object_ref") )
+ {
+ wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
+ wxXmlNode* refNode = FindResource(refName, wxEmptyString, TRUE);
+
+ if ( !refNode )
+ {
+ wxLogError(_("Referenced object node with ref=\"%s\" not found!"),
+ refName.c_str());
+ return NULL;
+ }
+
+ wxXmlNode copy(*refNode);
+ MergeNodes(copy, *node);
+
+ return CreateResFromNode(©, parent, instance);
+ }
+
wxXmlResourceHandler *handler;
wxObject *ret;
wxNode * ND = m_handlers.GetFirst();
}
+#include "wx/listimpl.cpp"
+WX_DECLARE_LIST(wxXmlSubclassFactory, wxXmlSubclassFactoriesList);
+WX_DEFINE_LIST(wxXmlSubclassFactoriesList);
+
+wxXmlSubclassFactoriesList *wxXmlResource::ms_subclassFactories = NULL;
+/*static*/ void wxXmlResource::AddSubclassFactory(wxXmlSubclassFactory *factory)
+{
+ if (!ms_subclassFactories)
+ {
+ ms_subclassFactories = new wxXmlSubclassFactoriesList;
+ ms_subclassFactories->DeleteContents(TRUE);
+ }
+ ms_subclassFactories->Append(factory);
+}
+class wxXmlSubclassFactoryCXX : public wxXmlSubclassFactory
+{
+public:
+ ~wxXmlSubclassFactoryCXX() {}
+
+ wxObject *Create(const wxString& className)
+ {
+ wxClassInfo* classInfo = wxClassInfo::FindClass(className);
+
+ if (classInfo)
+ return classInfo->CreateObject();
+ else
+ return NULL;
+ }
+};
wxObject *myParent = m_parent, *myInstance = m_instance;
wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow;
+ m_instance = instance;
+ if (!m_instance && node->HasProp(wxT("subclass")) &&
+ !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
+ {
+ wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);
+ if (!subclass.empty())
+ {
+ for (wxXmlSubclassFactoriesList::Node *i = wxXmlResource::ms_subclassFactories->GetFirst();
+ i; i = i->GetNext())
+ {
+ m_instance = i->GetData()->Create(subclass);
+ if (m_instance)
+ break;
+ }
+
+ if (!m_instance)
+ {
+ wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+ wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
+ subclass.c_str(), name.c_str());
+ }
+ }
+ }
+
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);
void wxXmlResourceHandler::AddWindowStyles()
{
- ADD_STYLE(wxSIMPLE_BORDER);
- ADD_STYLE(wxSUNKEN_BORDER);
- 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);
+ XRC_ADD_STYLE(wxSIMPLE_BORDER);
+ XRC_ADD_STYLE(wxSUNKEN_BORDER);
+ XRC_ADD_STYLE(wxDOUBLE_BORDER);
+ XRC_ADD_STYLE(wxRAISED_BORDER);
+ XRC_ADD_STYLE(wxSTATIC_BORDER);
+ XRC_ADD_STYLE(wxNO_BORDER);
+ XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
+ XRC_ADD_STYLE(wxWANTS_CHARS);
+ XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
}
if (!s) return defaults;
- wxStringTokenizer tkn(s, wxT("| "), wxTOKEN_STRTOK);
+ wxStringTokenizer tkn(s, wxT("| \t\n"), wxTOKEN_STRTOK);
int style = 0;
int index;
wxString fl;
-wxString wxXmlResourceHandler::GetText(const wxString& param)
+wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
{
- wxString str1 = GetParamValue(param);
+ 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").
+ // VS: First version of XRC 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
else str2 << *dt;
}
- if (m_resource->GetUseLocale())
+ if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE)
return wxGetTranslation(str2);
else
return str2;
+
}
}
+
int wxXmlResourceHandler::GetID()
{
wxString sid = GetName();
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_CLOSE_ALL);
#undef stdID
- else return XMLID(sid.c_str());
+ else return wxXmlResource::GetXRCID(sid);
}
+
wxString wxXmlResourceHandler::GetName()
{
return m_node->GetPropVal(wxT("name"), wxT("-1"));
if (v.Length() != 7 || v[0u] != wxT('#') ||
wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1)
{
- wxLogError(_("XML resource: Incorrect colour specification '%s' for property '%s'."),
+ wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."),
v.c_str(), param.c_str());
return wxNullColour;
}
-wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
+wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
+ const wxArtClient& defaultArtClient,
+ wxSize size)
{
+ /* If the bitmap is specified as stock item, query wxArtProvider for it: */
+ wxXmlNode *bmpNode = GetParamNode(param);
+ if ( bmpNode )
+ {
+ wxString sid = bmpNode->GetPropVal(wxT("stock_id"), wxEmptyString);
+ if ( !sid.empty() )
+ {
+ wxString scl = bmpNode->GetPropVal(wxT("stock_client"), defaultArtClient);
+ wxBitmap stockArt =
+ wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid),
+ wxART_MAKE_CLIENT_ID_FROM_STR(scl),
+ size);
+ if ( stockArt.Ok() )
+ return stockArt;
+ }
+ }
+
+ /* ...or load the bitmap from file: */
wxString name = GetParamValue(param);
if (name.IsEmpty()) return wxNullBitmap;
#if wxUSE_FILESYSTEM
wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
if (fsfile == NULL)
{
- wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
+ wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str());
return wxNullBitmap;
}
wxImage img(*(fsfile->GetStream()));
#else
wxImage img(GetParamValue(wxT("bitmap")));
#endif
+
if (!img.Ok())
{
- wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
+ wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str());
return wxNullBitmap;
}
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
- return img.ConvertToBitmap();
+ return wxBitmap(img);
+
}
-wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize size)
+wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,
+ const wxArtClient& defaultArtClient,
+ wxSize size)
{
#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
wxIcon icon;
- icon.CopyFromBitmap(GetBitmap(param, size));
+ icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size));
#else
wxIcon *iconpt;
wxBitmap bmppt = GetBitmap(param, size);
wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
{
+ wxCHECK_MSG(m_node, NULL, wxT("You can't access handler data before it was initialized!"));
+
wxXmlNode *n = m_node->GetChildren();
while (n)
if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||
!s.AfterLast(wxT(',')).ToLong(&sy))
{
- wxLogError(_("Cannot parse coordinates from '%s'."), s.mb_str());
+ wxLogError(_("Cannot parse coordinates from '%s'."), s.c_str());
return wxDefaultSize;
}
if (!s.ToLong(&sx))
{
- wxLogError(_("Cannot parse dimension from '%s'."), s.mb_str());
+ wxLogError(_("Cannot parse dimension from '%s'."), s.c_str());
return defaultv;
}
wxXmlNode *font_node = GetParamNode(param);
if (font_node == NULL)
{
- wxLogError(_("Cannot find font node '%s'."), param.mb_str());
+ wxLogError(_("Cannot find font node '%s'."), param.c_str());
return wxNullFont;
}
wxString encoding = GetParamValue(wxT("encoding"));
wxFontMapper mapper;
wxFontEncoding enc = wxFONTENCODING_DEFAULT;
- if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding);
- if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM;
+ if (!encoding.IsEmpty())
+ enc = mapper.CharsetToEncoding(encoding);
+ if (enc == wxFONTENCODING_SYSTEM)
+ enc = wxFONTENCODING_DEFAULT;
wxString faces = GetParamValue(wxT("face"));
wxString facename = wxEmptyString;
while (n)
{
if (n->GetType() == wxXML_ELEMENT_NODE &&
- n->GetName() == wxT("object"))
+ (n->GetName() == wxT("object") || n->GetName() == wxT("object_ref")))
{
if (this_hnd_only && CanHandle(n))
CreateResource(n, parent, NULL);
-// --------------- XMLID implementation -----------------------------
+// --------------- XRCID implementation -----------------------------
-#define XMLID_TABLE_SIZE 1024
+#define XRCID_TABLE_SIZE 1024
-struct XMLID_record
+struct XRCID_record
{
int id;
- char *key;
- XMLID_record *next;
+ wxChar *key;
+ XRCID_record *next;
};
-static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
+static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
-/*static*/ int wxXmlResource::GetXMLID(const char *str_id)
+/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
{
- static int XMLID_LastID = wxID_HIGHEST;
+ static int XRCID_LastID = wxID_HIGHEST;
int index = 0;
- for (const char *c = str_id; *c != '\0'; c++) index += (int)*c;
- index %= XMLID_TABLE_SIZE;
+ for (const wxChar *c = str_id; *c != wxT('\0'); c++) index += (int)*c;
+ index %= XRCID_TABLE_SIZE;
- XMLID_record *oldrec = NULL;
+ XRCID_record *oldrec = NULL;
int matchcnt = 0;
- for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
+ for (XRCID_record *rec = XRCID_Records[index]; rec; rec = rec->next)
{
- if (strcmp(rec->key, str_id) == 0)
+ if (wxStrcmp(rec->key, str_id) == 0)
{
return rec->id;
}
oldrec = rec;
}
- 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);
+ XRCID_record **rec_var = (oldrec == NULL) ?
+ &XRCID_Records[index] : &oldrec->next;
+ *rec_var = new XRCID_record;
+ (*rec_var)->id = ++XRCID_LastID;
+ (*rec_var)->key = wxStrdup(str_id);
(*rec_var)->next = NULL;
return (*rec_var)->id;
}
-static void CleanXMLID_Record(XMLID_record *rec)
+static void CleanXRCID_Record(XRCID_record *rec)
{
if (rec)
{
- CleanXMLID_Record(rec->next);
- free (rec->key);
+ CleanXRCID_Record(rec->next);
+ free(rec->key);
delete rec;
}
}
-static void CleanXMLID_Records()
+static void CleanXRCID_Records()
{
- for (int i = 0; i < XMLID_TABLE_SIZE; i++)
- CleanXMLID_Record(XMLID_Records[i]);
+ for (int i = 0; i < XRCID_TABLE_SIZE; i++)
+ CleanXRCID_Record(XRCID_Records[i]);
}
// --------------- module and globals -----------------------------
-
-static wxXmlResource gs_XmlResource;
-
-wxXmlResource *wxTheXmlResource = &gs_XmlResource;
-
-
class wxXmlResourceModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxXmlResourceModule)
public:
wxXmlResourceModule() {}
- bool OnInit() {return TRUE;}
+ bool OnInit()
+ {
+ wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
+ return TRUE;
+ }
void OnExit()
{
- wxTheXmlResource->ClearHandlers();
- CleanXMLID_Records();
+ delete wxXmlResource::Set(NULL);
+ wxDELETE(wxXmlResource::ms_subclassFactories);
+ CleanXRCID_Records();
}
};
projects / wxWidgets.git / blobdiff