X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a1b95962fd99022e3cb68cf73fe5b29fdfb2adf..2f1189cf1ae6185997851924552294e22ff56bef:/src/xrc/xmlres.cpp diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 745d4213fd..d9b2c4afff 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -24,6 +24,7 @@ #include "wx/frame.h" #include "wx/wfstream.h" #include "wx/filesys.h" +#include "wx/filename.h" #include "wx/log.h" #include "wx/intl.h" #include "wx/tokenzr.h" @@ -32,17 +33,33 @@ #include "wx/bitmap.h" #include "wx/image.h" #include "wx/fontmap.h" +#include "wx/artprov.h" -#include "wx/xrc/xml.h" +#include "wx/xml/xml.h" #include "wx/xrc/xmlres.h" #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords); +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_flags = flags; m_version = -1; } @@ -51,7 +68,6 @@ wxXmlResource::wxXmlResource(const wxString& filemask, int flags) { m_flags = flags; m_version = -1; - m_handlers.DeleteContents(TRUE); Load(filemask); } @@ -82,11 +98,30 @@ bool wxXmlResource::Load(const wxString& filemask) fnd = filemask; while (!!fnd) { + // NB: Load() accepts both filenames and URLs (should probably be + // changed to filenames only, but embedded resources currently + // rely on its ability to handle URLs - FIXME). This check + // serves as a quick way to determine whether found name is + // filename and not URL: + if (wxFileName::FileExists(fnd)) + { + // Make the name absolute filename, because the app may + // change working directory later: + wxFileName fn(fnd); + if (fn.IsRelative()) + { + fn.MakeAbsolute(); + fnd = fn.GetFullPath(); + } +#if wxUSE_FILESYSTEM + fnd = wxFileSystem::FileNameToURL(fnd); +#endif + } + #if wxUSE_FILESYSTEM - if (filemask.Lower().Matches(wxT("*.zip")) || - filemask.Lower().Matches(wxT("*.rsc"))) + if (fnd.Lower().Matches(wxT("*.zip")) || + fnd.Lower().Matches(wxT("*.xrs"))) { - rt = rt && Load(fnd + wxT("#zip:*.xmb")); rt = rt && Load(fnd + wxT("#zip:*.xrc")); } else @@ -104,10 +139,11 @@ bool wxXmlResource::Load(const wxString& filemask) } # undef wxXmlFindFirst # undef wxXmlFindNext - return rt; + return rt && UpdateResources(); } +IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject) void wxXmlResource::AddHandler(wxXmlResourceHandler *handler) { @@ -115,15 +151,20 @@ void wxXmlResource::AddHandler(wxXmlResourceHandler *handler) handler->SetParentResource(this); } +void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler) +{ + m_handlers.Insert(handler); + handler->SetParentResource(this); +} + void wxXmlResource::ClearHandlers() { - m_handlers.Clear(); + WX_CLEAR_LIST(wxList, m_handlers); } - wxMenu *wxXmlResource::LoadMenu(const wxString& name) { return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL); @@ -148,10 +189,7 @@ wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name) 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) @@ -171,6 +209,11 @@ bool wxXmlResource::LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& 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; @@ -196,6 +239,18 @@ wxIcon wxXmlResource::LoadIcon(const wxString& name) 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) { @@ -224,24 +279,25 @@ static void ProcessPlatformProperty(wxXmlNode *node) isok = TRUE; else { - wxStringTokenizer tkn(s, " |"); + wxStringTokenizer tkn(s, wxT(" |")); while (tkn.HasMoreTokens()) { s = tkn.GetNextToken(); - if ( -#ifdef __WXMSW__ - s == wxString(wxT("win")) +#ifdef __WINDOWS__ + if (s == wxT("win")) isok = true; +#endif +#if defined(__MAC__) || defined(__APPLE__) + if (s == wxT("mac")) isok = true; #elif defined(__UNIX__) - s == wxString(wxT("unix")) -#elif defined(__MAC__) - s == wxString(wxT("mac")) -#elif defined(__OS2__) - s == wxString(wxT("os2")) -#else - FALSE + if (s == wxT("unix")) isok = true; +#endif +#ifdef __OS2__ + if (s == wxT("os2")) isok = true; #endif - ) isok = TRUE; + + if (isok) + break; } } @@ -252,8 +308,8 @@ static void ProcessPlatformProperty(wxXmlNode *node) } else { - node->RemoveChild(c); wxXmlNode *c2 = c->GetNext(); + node->RemoveChild(c); delete c; c = c2; } @@ -262,14 +318,27 @@ static void ProcessPlatformProperty(wxXmlNode *node) -void wxXmlResource::UpdateResources() +bool wxXmlResource::UpdateResources() { + bool rt = true; bool modif; # if wxUSE_FILESYSTEM wxFSFile *file = NULL; + wxUnusedVar(file); 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); @@ -280,8 +349,12 @@ void wxXmlResource::UpdateResources() 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()); + rt = false; + } wxDELETE(file); + wxUnusedVar(file); # else modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time; # endif @@ -289,7 +362,7 @@ void wxXmlResource::UpdateResources() if (modif) { - wxInputStream *stream = NULL; + wxInputStream *stream = NULL; # if wxUSE_FILESYSTEM file = fsys.OpenFile(m_data[i].File); @@ -304,15 +377,18 @@ void wxXmlResource::UpdateResources() 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); + rt = false; } else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource")) { wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str()); wxDELETE(m_data[i].Doc); + rt = false; } else { @@ -328,45 +404,105 @@ void wxXmlResource::UpdateResources() if (m_version == -1) m_version = version; if (m_version != version) + { wxLogError(_("Resource files must have same version number!")); + rt = false; + } ProcessPlatformProperty(m_data[i].Doc->GetRoot()); +#if wxUSE_FILESYSTEM m_data[i].Time = file->GetModificationTime(); +#else + m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File)); +#endif } # if wxUSE_FILESYSTEM wxDELETE(file); + wxUnusedVar(file); # else wxDELETE(stream); # endif } } + + return rt; } +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; + } + } + + return NULL; +} -wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname) +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(_("XRC resource '%s' (class '%s') not found!"), @@ -374,24 +510,97 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& cla 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; -wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance) + 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, + wxXmlResourceHandler *handlerToUse) { 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(); - while (ND) + + if (handlerToUse) { - handler = (wxXmlResourceHandler*)ND->GetData(); - if (node->GetName() == wxT("object") && handler->CanHandle(node)) + if (handlerToUse->CanHandle(node)) { - ret = handler->CreateResource(node, parent, instance); - if (ret) return ret; + return handlerToUse->CreateResource(node, parent, instance); + } + } + else if (node->GetName() == wxT("object")) + { + wxList::compatibility_iterator ND = m_handlers.GetFirst(); + while (ND) + { + handler = (wxXmlResourceHandler*)ND->GetData(); + if (handler->CanHandle(node)) + { + return handler->CreateResource(node, parent, instance); + } + ND = ND->GetNext(); } - ND = ND->GetNext(); } wxLogError(_("No handler found for XML node '%s', class '%s'!"), @@ -401,8 +610,36 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx } +#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->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; + } +}; @@ -423,22 +660,27 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow; m_instance = instance; - if (!m_instance && node->HasProp(wxT("subclass")) && + if (!m_instance && node->HasProp(wxT("subclass")) && !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING)) { wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString); - wxClassInfo* classInfo = wxClassInfo::FindClass(subclass); - - if (classInfo) - m_instance = classInfo->CreateObject(); - - if (!m_instance) + if (!subclass.empty()) { - wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"), - subclass.c_str(), node->GetPropVal(wxT("name"), wxEmptyString).c_str()); - } + for (wxXmlSubclassFactoriesList::compatibility_iterator i = wxXmlResource::ms_subclassFactories->GetFirst(); + i; i = i->GetNext()) + { + m_instance = i->GetData()->Create(subclass); + if (m_instance) + break; + } - m_instance = classInfo->CreateObject(); + 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; @@ -477,6 +719,7 @@ void wxXmlResourceHandler::AddWindowStyles() XRC_ADD_STYLE(wxTRANSPARENT_WINDOW); XRC_ADD_STYLE(wxWANTS_CHARS); XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE); + XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS); } @@ -493,7 +736,7 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults) 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; @@ -511,21 +754,17 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults) -wxString wxXmlResourceHandler::GetText(const wxString& param) +wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate) { - wxString str1; + wxXmlNode *parNode = GetParamNode(param); + wxString str1(GetNodeContent(parNode)); wxString str2; const wxChar *dt; wxChar amp_char; - if (m_resource->GetFlags() & wxXRC_USE_LOCALE) - str1 = wxGetTranslation(GetParamValue(param)); - else - str1 = GetParamValue(param); - - // 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"). + // 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 @@ -553,8 +792,32 @@ wxString wxXmlResourceHandler::GetText(const wxString& param) } else str2 << *dt; } - - return str2; + + if (m_resource->GetFlags() & wxXRC_USE_LOCALE) + { + if (translate && parNode && + parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0")) + { + return wxGetTranslation(str2); + } + else + { +#if wxUSE_UNICODE + return str2; +#else + // The string is internally stored as UTF-8, we have to convert + // it into system's default encoding so that it can be displayed: + return wxString(str2.mb_str(wxConvUTF8), wxConvLocal); +#endif + } + } + else + { + // If wxXRC_USE_LOCALE is not set, then the string is already in + // system's default encoding in ANSI build, so we don't have to + // do anything special here. + return str2; + } } @@ -571,32 +834,14 @@ long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv) } + int wxXmlResourceHandler::GetID() { - 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_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW); - stdID(wxID_SAVE); stdID(wxID_SAVEAS); stdID(wxID_REVERT); - 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_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); -#undef stdID - else return wxXmlResource::GetXMLID(sid); + return wxXmlResource::GetXRCID(GetName()); } + wxString wxXmlResourceHandler::GetName() { return m_node->GetPropVal(wxT("name"), wxT("-1")); @@ -634,15 +879,36 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param) -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(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str()); + wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), + name.c_str()); return wxNullBitmap; } wxImage img(*(fsfile->GetStream())); @@ -650,28 +916,25 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size) #else wxImage img(GetParamValue(wxT("bitmap"))); #endif + if (!img.Ok()) { 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)); -#else - wxIcon *iconpt; - wxBitmap bmppt = GetBitmap(param, size); - iconpt = (wxIcon*)(&bmppt); - wxIcon icon(*iconpt); -#endif + icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size)); return icon; } @@ -679,6 +942,8 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize 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) @@ -724,7 +989,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param) wxString s = GetParamValue(param); if (s.IsEmpty()) s = wxT("-1,-1"); bool is_dlg; - long sx, sy; + long sx, sy = 0; is_dlg = s[s.Length()-1] == wxT('d'); if (is_dlg) s.RemoveLast(); @@ -888,12 +1153,10 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent, bool this_hnd_only) 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); - else - m_resource->CreateResFromNode(n, parent, NULL); + m_resource->CreateResFromNode(n, parent, NULL, + this_hnd_only ? this : NULL); } n = n->GetNext(); } @@ -922,70 +1185,110 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode * -// --------------- XMLID implementation ----------------------------- +// --------------- XRCID implementation ----------------------------- -#define XMLID_TABLE_SIZE 1024 +#define XRCID_TABLE_SIZE 1024 -struct XMLID_record +struct XRCID_record { int id; wxChar *key; - XMLID_record *next; + 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 wxChar *str_id) +static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2) { - static int XMLID_LastID = wxID_HIGHEST; + static int XRCID_LastID = wxID_HIGHEST; int index = 0; for (const wxChar *c = str_id; *c != wxT('\0'); c++) index += (int)*c; - index %= XMLID_TABLE_SIZE; + index %= XRCID_TABLE_SIZE; - XMLID_record *oldrec = NULL; - int matchcnt = 0; - for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next) + XRCID_record *oldrec = NULL; + for (XRCID_record *rec = XRCID_Records[index]; rec; rec = rec->next) { if (wxStrcmp(rec->key, str_id) == 0) { return rec->id; } - matchcnt++; oldrec = rec; } - XMLID_record **rec_var = (oldrec == NULL) ? - &XMLID_Records[index] : &oldrec->next; - *rec_var = new XMLID_record; - (*rec_var)->id = ++XMLID_LastID; + XRCID_record **rec_var = (oldrec == NULL) ? + &XRCID_Records[index] : &oldrec->next; + *rec_var = new XRCID_record; (*rec_var)->key = wxStrdup(str_id); (*rec_var)->next = NULL; + wxChar *end; + if (value_if_not_found != -2) + (*rec_var)->id = value_if_not_found; + else + { + 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; } +/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id) +{ + return XRCID_Lookup(str_id); +} + -static void CleanXMLID_Record(XMLID_record *rec) +static void CleanXRCID_Record(XRCID_record *rec) { if (rec) { - CleanXMLID_Record(rec->next); + 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]); + XRCID_Records[i] = NULL; + } } - - +static void AddStdXRCID_Records() +{ +#define stdID(id) XRCID_Lookup(wxT(#id), id) + stdID(-1); + stdID(wxID_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW); + stdID(wxID_SAVE); stdID(wxID_SAVEAS); stdID(wxID_REVERT); + 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_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_CLOSE_ALL); +#undef stdID +} @@ -993,22 +1296,24 @@ static void CleanXMLID_Records() // --------------- 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() + { + AddStdXRCID_Records(); + wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX); + return TRUE; + } void OnExit() { - wxTheXmlResource->ClearHandlers(); - CleanXMLID_Records(); + delete wxXmlResource::Set(NULL); + if(wxXmlResource::ms_subclassFactories) + WX_CLEAR_LIST(wxXmlSubclassFactoriesList, *wxXmlResource::ms_subclassFactories); + wxDELETE(wxXmlResource::ms_subclassFactories); + CleanXRCID_Records(); } }; @@ -1023,5 +1328,3 @@ void wxXmlInitResourceModule() module->Init(); wxModule::RegisterModule(module); } - -