/////////////////////////////////////////////////////////////////////////////
-// Name: xmlres.cpp
+// Name: src/xrc/xmlres.cpp
// Purpose: XRC resources
// Author: Vaclav Slavik
// Created: 2000/03/05
#if wxUSE_XRC
+#include "wx/xrc/xmlres.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/panel.h"
+ #include "wx/frame.h"
+ #include "wx/dialog.h"
+ #include "wx/settings.h"
+ #include "wx/bitmap.h"
+ #include "wx/image.h"
+ #include "wx/module.h"
+ #include "wx/wxcrtvararg.h"
+#endif
+
#ifndef __WXWINCE__
-#include <locale.h>
+ #include <locale.h>
#endif
-#include "wx/dialog.h"
-#include "wx/panel.h"
-#include "wx/frame.h"
+#include "wx/vector.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"
#include "wx/fontenum.h"
-#include "wx/module.h"
-#include "wx/bitmap.h"
-#include "wx/image.h"
#include "wx/fontmap.h"
#include "wx/artprov.h"
-#include "wx/settings.h"
#include "wx/xml/xml.h"
-#include "wx/xrc/xmlres.h"
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords)
+
+class wxXmlResourceDataRecord
+{
+public:
+ wxXmlResourceDataRecord() : Doc(NULL) {
+#if wxUSE_DATETIME
+ Time = wxDateTime::Now();
+#endif
+ }
+ ~wxXmlResourceDataRecord() {delete Doc;}
+
+ wxString File;
+ wxXmlDocument *Doc;
+#if wxUSE_DATETIME
+ wxDateTime Time;
+#endif
+};
+
+class wxXmlResourceDataRecords : public wxVector<wxXmlResourceDataRecord*>
+{
+ // this is a class so that it can be forward-declared
+};
wxXmlResource *wxXmlResource::ms_instance = NULL;
return old;
}
-wxXmlResource::wxXmlResource(int flags)
+wxXmlResource::wxXmlResource(int flags, const wxString& domain)
{
m_flags = flags;
m_version = -1;
+ m_data = new wxXmlResourceDataRecords;
+ SetDomain(domain);
}
-wxXmlResource::wxXmlResource(const wxString& filemask, int flags)
+wxXmlResource::wxXmlResource(const wxString& filemask, int flags, const wxString& domain)
{
m_flags = flags;
m_version = -1;
+ m_data = new wxXmlResourceDataRecords;
+ SetDomain(domain);
Load(filemask);
}
wxXmlResource::~wxXmlResource()
{
ClearHandlers();
+
+ for ( wxXmlResourceDataRecords::iterator i = m_data->begin();
+ i != m_data->end(); ++i )
+ {
+ delete *i;
+ }
+ delete m_data;
+}
+
+void wxXmlResource::SetDomain(const wxString& domain)
+{
+ m_domain = domain;
}
bool wxXmlResource::Load(const wxString& filemask)
{
- wxString fnd;
- wxXmlResourceDataRecord *drec;
- bool iswild = wxIsWild(filemask);
- bool rt = true;
-
#if wxUSE_FILESYSTEM
wxFileSystem fsys;
# define wxXmlFindFirst fsys.FindFirst(filemask, wxFILE)
# define wxXmlFindFirst wxFindFirstFile(filemask, wxFILE)
# define wxXmlFindNext wxFindNextFile()
#endif
- if (iswild)
- fnd = wxXmlFindFirst;
- else
- fnd = filemask;
+ wxString fnd = wxXmlFindFirst;
+ if ( fnd.empty() )
+ {
+ wxLogError(_("Cannot load resources from '%s'."), filemask);
+ return false;
+ }
+
while (!fnd.empty())
{
fnd = ConvertFileNameToURL(fnd);
#if wxUSE_FILESYSTEM
if ( IsArchive(fnd) )
{
- rt = rt && Load(fnd + wxT("#zip:*.xrc"));
+ if ( !Load(fnd + wxT("#zip:*.xrc")) )
+ return false;
}
else // a single resource URL
#endif // wxUSE_FILESYSTEM
{
- drec = new wxXmlResourceDataRecord;
+ wxXmlResourceDataRecord *drec = new wxXmlResourceDataRecord;
drec->File = fnd;
- m_data.Add(drec);
+ Data().push_back(drec);
}
- if (iswild)
- fnd = wxXmlFindNext;
- else
- fnd = wxEmptyString;
+ fnd = wxXmlFindNext;
}
# undef wxXmlFindFirst
# undef wxXmlFindNext
- return rt && UpdateResources();
+
+ return UpdateResources();
}
bool wxXmlResource::Unload(const wxString& filename)
#endif // wxUSE_FILESYSTEM
bool unloaded = false;
- const size_t count = m_data.GetCount();
- for ( size_t i = 0; i < count; i++ )
+ for ( wxXmlResourceDataRecords::iterator i = Data().begin();
+ i != Data().end(); ++i )
{
#if wxUSE_FILESYSTEM
if ( isArchive )
{
- if ( m_data[i].File.StartsWith(fnd) )
+ if ( (*i)->File.StartsWith(fnd) )
unloaded = true;
// don't break from the loop, we can have other matching files
}
else // a single resource URL
#endif // wxUSE_FILESYSTEM
{
- if ( m_data[i].File == fnd )
+ if ( (*i)->File == fnd )
{
- m_data.RemoveAt(i);
+ delete *i;
+ Data().erase(i);
unloaded = true;
// no sense in continuing, there is only one file with this URL
void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
{
- m_handlers.Append(handler);
+ m_handlers.push_back(handler);
handler->SetParentResource(this);
}
void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
{
- m_handlers.Insert(handler);
+ m_handlers.insert(m_handlers.begin(), handler);
handler->SetParentResource(this);
}
void wxXmlResource::ClearHandlers()
{
- WX_CLEAR_LIST(wxList, m_handlers);
+ for ( wxVector<wxXmlResourceHandler*>::iterator i = m_handlers.begin();
+ i != m_handlers.end(); ++i )
+ delete *i;
+ m_handlers.clear();
}
while (c)
{
isok = false;
- if (!c->GetPropVal(wxT("platform"), &s))
+ if (!c->GetAttribute(wxT("platform"), &s))
isok = true;
else
{
}
#endif
- for (size_t i = 0; i < m_data.GetCount(); i++)
+ for ( wxXmlResourceDataRecords::iterator i = Data().begin();
+ i != Data().end(); ++i )
{
- modif = (m_data[i].Doc == NULL);
+ wxXmlResourceDataRecord* const rec = *i;
+
+ modif = (rec->Doc == NULL);
if (!modif && !(m_flags & wxXRC_NO_RELOADING))
{
# if wxUSE_FILESYSTEM
- file = fsys.OpenFile(m_data[i].File);
+ file = fsys.OpenFile(rec->File);
# if wxUSE_DATETIME
- modif = file && file->GetModificationTime() > m_data[i].Time;
+ modif = file && file->GetModificationTime() > rec->Time;
# else // wxUSE_DATETIME
modif = true;
# endif // wxUSE_DATETIME
if (!file)
{
- wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());
+ wxLogError(_("Cannot open file '%s'."), rec->File);
rt = false;
}
wxDELETE(file);
wxUnusedVar(file);
# else // wxUSE_FILESYSTEM
# if wxUSE_DATETIME
- modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
+ modif = wxDateTime(wxFileModificationTime(rec->File)) > rec->Time;
# else // wxUSE_DATETIME
modif = true;
# endif // wxUSE_DATETIME
if (modif)
{
- wxLogTrace(_T("xrc"),
- _T("opening file '%s'"), m_data[i].File.c_str());
+ wxLogTrace(_T("xrc"), _T("opening file '%s'"), rec->File);
wxInputStream *stream = NULL;
# if wxUSE_FILESYSTEM
- file = fsys.OpenFile(m_data[i].File);
+ file = fsys.OpenFile(rec->File);
if (file)
stream = file->GetStream();
# else
- stream = new wxFileInputStream(m_data[i].File);
+ stream = new wxFileInputStream(rec->File);
# endif
if (stream)
{
- delete m_data[i].Doc;
- m_data[i].Doc = new wxXmlDocument;
+ delete rec->Doc;
+ rec->Doc = new wxXmlDocument;
}
- if (!stream || !m_data[i].Doc->Load(*stream, encoding))
+ if (!stream || !rec->Doc->Load(*stream, encoding))
{
wxLogError(_("Cannot load resources from file '%s'."),
- m_data[i].File.c_str());
- wxDELETE(m_data[i].Doc);
+ rec->File);
+ wxDELETE(rec->Doc);
rt = false;
}
- else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
+ else if (rec->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);
+ wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), rec->File);
+ wxDELETE(rec->Doc);
rt = false;
}
else
{
long version;
int v1, v2, v3, v4;
- wxString verstr = m_data[i].Doc->GetRoot()->GetPropVal(
+ wxString verstr = rec->Doc->GetRoot()->GetAttribute(
wxT("version"), wxT("0.0.0.0"));
if (wxSscanf(verstr.c_str(), wxT("%i.%i.%i.%i"),
&v1, &v2, &v3, &v4) == 4)
rt = false;
}
- ProcessPlatformProperty(m_data[i].Doc->GetRoot());
+ ProcessPlatformProperty(rec->Doc->GetRoot());
#if wxUSE_DATETIME
#if wxUSE_FILESYSTEM
- m_data[i].Time = file->GetModificationTime();
+ rec->Time = file->GetModificationTime();
#else // wxUSE_FILESYSTEM
- m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File));
+ rec->Time = wxDateTime(wxFileModificationTime(rec->File));
#endif // wxUSE_FILESYSTEM
#endif // wxUSE_DATETIME
}
if ( node->GetType() == wxXML_ELEMENT_NODE &&
(node->GetName() == wxT("object") ||
node->GetName() == wxT("object_ref")) &&
- node->GetPropVal(wxT("name"), &dummy) && dummy == name )
+ node->GetAttribute(wxT("name"), &dummy) && dummy == name )
{
- wxString cls(node->GetPropVal(wxT("class"), wxEmptyString));
+ wxString cls(node->GetAttribute(wxT("class"), wxEmptyString));
if (!classname || cls == classname)
return node;
- // object_ref may not have 'class' property:
+ // object_ref may not have 'class' attribute:
if (cls.empty() && node->GetName() == wxT("object_ref"))
{
- wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
+ wxString refName = node->GetAttribute(wxT("ref"), wxEmptyString);
if (refName.empty())
continue;
wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
if (refNode &&
- refNode->GetPropVal(wxT("class"), wxEmptyString) == classname)
+ refNode->GetAttribute(wxT("class"), wxEmptyString) == classname)
{
return node;
}
UpdateResources(); //ensure everything is up-to-date
wxString dummy;
- for (size_t f = 0; f < m_data.GetCount(); f++)
+ for ( wxXmlResourceDataRecords::const_iterator f = Data().begin();
+ f != Data().end(); ++f )
{
- if ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL )
+ wxXmlResourceDataRecord* const rec = *f;
+ if ( rec->Doc == NULL || rec->Doc->GetRoot() == NULL )
continue;
- wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(),
+ wxXmlNode* found = DoFindResource(rec->Doc->GetRoot(),
name, classname, recursive);
if ( found )
{
#if wxUSE_FILESYSTEM
- m_curFileSystem.ChangePathTo(m_data[f].File);
+ m_curFileSystem.ChangePathTo(rec->File);
#endif
return found;
}
static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
{
- // Merge properties:
- for (wxXmlProperty *prop = with.GetProperties(); prop; prop = prop->GetNext())
+ // Merge attributes:
+ for ( wxXmlAttribute *attr = with.GetAttributes();
+ attr; attr = attr->GetNext() )
{
- wxXmlProperty *dprop;
- for (dprop = dest.GetProperties(); dprop; dprop = dprop->GetNext())
+ wxXmlAttribute *dattr;
+ for (dattr = dest.GetAttributes(); dattr; dattr = dattr->GetNext())
{
- if ( dprop->GetName() == prop->GetName() )
+ if ( dattr->GetName() == attr->GetName() )
{
- dprop->SetValue(prop->GetValue());
+ dattr->SetValue(attr->GetValue());
break;
}
}
- if ( !dprop )
- dest.AddProperty(prop->GetName(), prop->GetValue());
+ if ( !dattr )
+ dest.AddAttribute(attr->GetName(), attr->GetValue());
}
// Merge child nodes:
for (wxXmlNode* node = with.GetChildren(); node; node = node->GetNext())
{
- wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+ wxString name = node->GetAttribute(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->GetAttribute(wxT("name"), wxEmptyString) == name &&
dnode->GetType() == node->GetType() )
{
MergeNodes(*dnode, *node);
}
if ( !dnode )
- dest.AddChild(new wxXmlNode(*node));
+ {
+ static const wxChar *AT_END = wxT("end");
+ wxString insert_pos = node->GetAttribute(wxT("insert_at"), AT_END);
+ if ( insert_pos == AT_END )
+ {
+ dest.AddChild(new wxXmlNode(*node));
+ }
+ else if ( insert_pos == wxT("begin") )
+ {
+ dest.InsertChild(new wxXmlNode(*node), dest.GetChildren());
+ }
+ }
}
- if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
+ if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().length() )
dest.SetContent(with.GetContent());
}
// handling of referenced resource
if ( node->GetName() == wxT("object_ref") )
{
- wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
+ wxString refName = node->GetAttribute(wxT("ref"), wxEmptyString);
wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
if ( !refNode )
return CreateResFromNode(©, parent, instance);
}
- wxXmlResourceHandler *handler;
-
if (handlerToUse)
{
if (handlerToUse->CanHandle(node))
}
else if (node->GetName() == wxT("object"))
{
- wxList::compatibility_iterator ND = m_handlers.GetFirst();
- while (ND)
+ for ( wxVector<wxXmlResourceHandler*>::iterator h = m_handlers.begin();
+ h != m_handlers.end(); ++h )
{
- handler = (wxXmlResourceHandler*)ND->GetData();
+ wxXmlResourceHandler *handler = *h;
if (handler->CanHandle(node))
- {
return handler->CreateResource(node, parent, instance);
- }
- ND = ND->GetNext();
}
}
wxLogError(_("No handler found for XML node '%s', class '%s'!"),
node->GetName().c_str(),
- node->GetPropVal(wxT("class"), wxEmptyString).c_str());
+ node->GetAttribute(wxT("class"), wxEmptyString).c_str());
return NULL;
}
-#include "wx/listimpl.cpp"
-WX_DECLARE_LIST(wxXmlSubclassFactory, wxXmlSubclassFactoriesList);
-WX_DEFINE_LIST(wxXmlSubclassFactoriesList)
+class wxXmlSubclassFactories : public wxVector<wxXmlSubclassFactory*>
+{
+ // this is a class so that it can be forward-declared
+};
-wxXmlSubclassFactoriesList *wxXmlResource::ms_subclassFactories = NULL;
+wxXmlSubclassFactories *wxXmlResource::ms_subclassFactories = NULL;
/*static*/ void wxXmlResource::AddSubclassFactory(wxXmlSubclassFactory *factory)
{
if (!ms_subclassFactories)
{
- ms_subclassFactories = new wxXmlSubclassFactoriesList;
+ ms_subclassFactories = new wxXmlSubclassFactories;
}
- ms_subclassFactories->Append(factory);
+ ms_subclassFactories->push_back(factory);
}
class wxXmlSubclassFactoryCXX : public wxXmlSubclassFactory
wxWindow *myParentAW = m_parentAsWindow;
m_instance = instance;
- if (!m_instance && node->HasProp(wxT("subclass")) &&
+ if (!m_instance && node->HasAttribute(wxT("subclass")) &&
!(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
{
- wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);
+ wxString subclass = node->GetAttribute(wxT("subclass"), wxEmptyString);
if (!subclass.empty())
{
- for (wxXmlSubclassFactoriesList::compatibility_iterator i = wxXmlResource::ms_subclassFactories->GetFirst();
- i; i = i->GetNext())
+ for (wxXmlSubclassFactories::iterator i = wxXmlResource::ms_subclassFactories->begin();
+ i != wxXmlResource::ms_subclassFactories->end(); ++i)
{
- m_instance = i->GetData()->Create(subclass);
+ m_instance = (*i)->Create(subclass);
if (m_instance)
break;
}
if (!m_instance)
{
- wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+ wxString name = node->GetAttribute(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_class = node->GetAttribute(wxT("class"), wxEmptyString);
m_parent = parent;
m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
wxXmlNode *parNode = GetParamNode(param);
wxString str1(GetNodeContent(parNode));
wxString str2;
- const wxChar *dt;
- wxChar amp_char;
+
+ // "\\" wasn't translated to "\" prior to 2.5.3.0:
+ const bool escapeBackslash = (m_resource->CompareVersion(2,5,3,0) >= 0);
// 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
- amp_char = wxT('_');
+ const wxChar amp_char = (m_resource->CompareVersion(2,3,0,1) < 0)
+ ? '$' : '_';
- for (dt = str1.c_str(); *dt; dt++)
+ for ( wxString::const_iterator dt = str1.begin(); dt != str1.end(); ++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 )
{
if ( *(++dt) == amp_char )
str2 << amp_char;
str2 << wxT('&') << *dt;
}
// Remap \n to CR, \r to LF, \t to TAB, \\ to \:
- else if (*dt == wxT('\\'))
- switch (*(++dt))
+ else if ( *dt == wxT('\\') )
+ {
+ switch ( (*(++dt)).GetValue() )
{
case wxT('n'):
str2 << wxT('\n');
case wxT('\\') :
// "\\" wasn't translated to "\" prior to 2.5.3.0:
- if (m_resource->CompareVersion(2,5,3,0) >= 0)
+ if ( escapeBackslash )
{
str2 << wxT('\\');
break;
str2 << wxT('\\') << *dt;
break;
}
- else str2 << *dt;
+ }
+ else
+ {
+ str2 << *dt;
+ }
}
if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
{
if (translate && parNode &&
- parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0"))
+ parNode->GetAttribute(wxT("translate"), wxEmptyString) != wxT("0"))
{
- return wxGetTranslation(str2);
+ return wxGetTranslation(str2, m_resource->GetDomain());
}
else
{
#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);
+ return wxString(str2.wc_str(wxConvUTF8), wxConvLocal);
#endif
}
}
float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv)
{
- double value;
- wxString str1 = GetParamValue(param);
+ wxString str = GetParamValue(param);
-#ifndef __WXWINCE__
- const char *prevlocale = setlocale(LC_NUMERIC, "C");
-#endif
+#if wxUSE_INTL
+ // strings in XRC always use C locale but wxString::ToDouble() uses the
+ // current one, so transform the string to it supposing that the only
+ // difference between them is the decimal separator
+ //
+ // TODO: use wxString::ToCDouble() when we have it
+ str.Replace(wxT("."), wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
+ wxLOCALE_CAT_NUMBER));
+#endif // wxUSE_INTL
- if (!str1.ToDouble(&value))
+ double value;
+ if (!str.ToDouble(&value))
value = defaultv;
-#ifndef __WXWINCE__
- setlocale(LC_NUMERIC, prevlocale);
-#endif
-
return wx_truncate_cast(float, value);
}
wxString wxXmlResourceHandler::GetName()
{
- return m_node->GetPropVal(wxT("name"), wxT("-1"));
+ return m_node->GetAttribute(wxT("name"), wxT("-1"));
}
+bool wxXmlResourceHandler::GetBoolAttr(const wxString& attr, bool defaultv)
+{
+ wxString v;
+ return m_node->GetAttribute(attr, &v) ? v == '1' : defaultv;
+}
+
bool wxXmlResourceHandler::GetBool(const wxString& param, bool defaultv)
{
- wxString v = GetParamValue(param);
- v.MakeLower();
- if (!v) return defaultv;
+ const wxString v = GetParamValue(param);
- return (v == wxT("1"));
+ return v.empty() ? defaultv : (v == '1');
}
return wxNullColour;
}
-wxColour wxXmlResourceHandler::GetColour(const wxString& param)
+wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour& defaultv)
{
wxString v = GetParamValue(param);
- // find colour using HTML syntax (#RRGGBB)
- unsigned long tmp = 0;
+ if ( v.empty() )
+ return defaultv;
+
+ wxColour clr;
- if (v.Length() != 7 || v[0u] != wxT('#') ||
- wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1)
+ // wxString -> wxColour conversion
+ if (!clr.Set(v))
{
// the colour doesn't use #RRGGBB format, check if it is symbolic
// colour name:
- wxColour clr = GetSystemColour(v);
+ clr = GetSystemColour(v);
if (clr.Ok())
return clr;
- wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."),
+ wxLogError(_("XRC resource: Incorrect colour specification '%s' for attribute '%s'."),
v.c_str(), param.c_str());
return wxNullColour;
}
- return wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
- (unsigned char) ((tmp & 0x00FF00) >> 8),
- (unsigned char) ((tmp & 0x0000FF)));
+ return clr;
}
wxXmlNode *bmpNode = GetParamNode(param);
if ( bmpNode )
{
- wxString sid = bmpNode->GetPropVal(wxT("stock_id"), wxEmptyString);
+ wxString sid = bmpNode->GetAttribute(wxT("stock_id"), wxEmptyString);
if ( !sid.empty() )
{
- wxString scl = bmpNode->GetPropVal(wxT("stock_client"), wxEmptyString);
+ wxString scl = bmpNode->GetAttribute(wxT("stock_client"), wxEmptyString);
if (scl.empty())
scl = defaultArtClient;
else
wxString name = GetParamValue(param);
if (name.empty()) return wxNullBitmap;
#if wxUSE_FILESYSTEM
- wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
+ wxFSFile *fsfile = GetCurFileSystem().OpenFile(name, wxFS_READ | wxFS_SEEKABLE);
if (fsfile == NULL)
{
wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
wxImage img(*(fsfile->GetStream()));
delete fsfile;
#else
- wxImage img(GetParamValue(wxT("bitmap")));
+ wxImage img(name);
#endif
if (!img.Ok())
{
wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
- param.c_str());
+ name.c_str());
return wxNullBitmap;
}
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
-#if !defined(__WXMSW__) || wxUSE_WXDIB
return wxBitmap(img);
-#else
- return wxBitmap();
-#endif
}
-
wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,
const wxArtClient& defaultArtClient,
wxSize size)
}
+
+bool wxXmlResourceHandler::IsOfClass(wxXmlNode *node, const wxString& classname)
+{
+ return node->GetAttribute(wxT("class"), wxEmptyString) == classname;
+}
+
+
+
wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
{
wxXmlNode *n = node;
bool is_dlg;
long sx, sy = 0;
- is_dlg = s[s.Length()-1] == wxT('d');
+ is_dlg = s[s.length()-1] == wxT('d');
if (is_dlg) s.RemoveLast();
if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||
bool is_dlg;
long sx;
- is_dlg = s[s.Length()-1] == wxT('d');
+ is_dlg = s[s.length()-1] == wxT('d');
if (is_dlg) s.RemoveLast();
if (!s.ToLong(&sx))
// font attributes:
// size
- int isize = wxDEFAULT;
+ int isize = -1;
bool hasSize = HasParam(wxT("size"));
if (hasSize)
- isize = GetLong(wxT("size"), wxDEFAULT);
+ isize = GetLong(wxT("size"), -1);
// style
int istyle = wxNORMAL;
if (hasFacename)
{
wxString faces = GetParamValue(wxT("face"));
- wxFontEnumerator enu;
- enu.EnumerateFacenames();
wxStringTokenizer tk(faces, wxT(","));
+#if wxUSE_FONTENUM
+ wxArrayString facenames(wxFontEnumerator::GetFacenames());
while (tk.HasMoreTokens())
{
- int index = enu.GetFacenames()->Index(tk.GetNextToken(), false);
+ int index = facenames.Index(tk.GetNextToken(), false);
if (index != wxNOT_FOUND)
{
- facename = (*enu.GetFacenames())[index];
+ facename = facenames[index];
break;
}
}
+#else // !wxUSE_FONTENUM
+ // just use the first face name if we can't check its availability:
+ if (tk.HasMoreTokens())
+ facename = tk.GetNextToken();
+#endif // wxUSE_FONTENUM/!wxUSE_FONTENUM
}
// encoding
}
// is this font based on a system font?
- wxFont sysfont = GetSystemFont(GetParamValue(wxT("sysfont")));
+ wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));
- if (sysfont.Ok())
+ if (font.Ok())
{
- if (hasSize)
- sysfont.SetPointSize(isize);
+ if (hasSize && isize != -1)
+ font.SetPointSize(isize);
else if (HasParam(wxT("relativesize")))
- sysfont.SetPointSize(int(sysfont.GetPointSize() *
+ font.SetPointSize(int(font.GetPointSize() *
GetFloat(wxT("relativesize"))));
if (hasStyle)
- sysfont.SetStyle(istyle);
+ font.SetStyle(istyle);
if (hasWeight)
- sysfont.SetWeight(iweight);
+ font.SetWeight(iweight);
if (hasUnderlined)
- sysfont.SetUnderlined(underlined);
+ font.SetUnderlined(underlined);
if (hasFamily)
- sysfont.SetFamily(ifamily);
+ font.SetFamily(ifamily);
if (hasFacename)
- sysfont.SetFaceName(facename);
+ font.SetFaceName(facename);
if (hasEncoding)
- sysfont.SetDefaultEncoding(enc);
-
- m_node = oldnode;
- return sysfont;
+ font.SetDefaultEncoding(enc);
+ }
+ else // not based on system font
+ {
+ font = wxFont(isize == -1 ? wxNORMAL_FONT->GetPointSize() : isize,
+ ifamily, istyle, iweight,
+ underlined, facename, enc);
}
m_node = oldnode;
- return wxFont(isize, ifamily, istyle, iweight,
- underlined, facename, enc);
+ return font;
}
struct XRCID_record
{
- int id;
- wxChar *key;
+ /* Hold the id so that once an id is allocated for a name, it
+ does not get created again by NewControlId at least
+ until we are done with it */
+ wxWindowIDRef id;
+ char *key;
XRCID_record *next;
};
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 char *str_id, int value_if_not_found = wxID_NONE)
{
int index = 0;
- for (const wxChar *c = str_id; *c != wxT('\0'); c++) index += (int)*c;
+ for (const char *c = str_id; *c != '\0'; c++) index += (int)*c;
index %= XRCID_TABLE_SIZE;
XRCID_record *oldrec = NULL;
(*rec_var)->key = wxStrdup(str_id);
(*rec_var)->next = NULL;
- wxChar *end;
- if (value_if_not_found != -2)
+ char *end;
+ if (value_if_not_found != wxID_NONE)
(*rec_var)->id = value_if_not_found;
else
{
}
else
{
- (*rec_var)->id = wxNewId();
+ (*rec_var)->id = wxWindowBase::NewControlId();
}
}
static void AddStdXRCID_Records();
-/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
+/*static*/
+int wxXmlResource::DoGetXRCID(const char *str_id, int value_if_not_found)
{
static bool s_stdIDsAdded = false;
AddStdXRCID_Records();
}
- return XRCID_Lookup(str_id);
+ return XRCID_Lookup(str_id, value_if_not_found);
}
+/* static */
+wxString wxXmlResource::FindXRCIDById(int numId)
+{
+ for ( int i = 0; i < XRCID_TABLE_SIZE; i++ )
+ {
+ for ( XRCID_record *rec = XRCID_Records[i]; rec; rec = rec->next )
+ {
+ if ( rec->id == numId )
+ return wxString(rec->key);
+ }
+ }
+
+ return wxString();
+}
static void CleanXRCID_Record(XRCID_record *rec)
{
if (rec)
{
CleanXRCID_Record(rec->next);
+
free(rec->key);
delete rec;
}
static void AddStdXRCID_Records()
{
-#define stdID(id) XRCID_Lookup(wxT(#id), id)
+#define stdID(id) XRCID_Lookup(#id, id)
stdID(-1);
stdID(wxID_ANY);
stdID(wxID_HELP);
stdID(wxID_PRINT);
stdID(wxID_PRINT_SETUP);
+ stdID(wxID_PAGE_SETUP);
stdID(wxID_PREVIEW);
stdID(wxID_ABOUT);
stdID(wxID_HELP_CONTENTS);
stdID(wxID_HELP_CONTEXT);
stdID(wxID_CLOSE_ALL);
stdID(wxID_PREFERENCES);
+ stdID(wxID_EDIT);
stdID(wxID_CUT);
stdID(wxID_COPY);
stdID(wxID_PASTE);
stdID(wxID_MAXIMIZE_FRAME);
stdID(wxID_ICONIZE_FRAME);
stdID(wxID_RESTORE_FRAME);
+ stdID(wxID_CDROM);
+ stdID(wxID_CONVERT);
+ stdID(wxID_EXECUTE);
+ stdID(wxID_FLOPPY);
+ stdID(wxID_HARDDISK);
+ stdID(wxID_BOTTOM);
+ stdID(wxID_FIRST);
+ stdID(wxID_LAST);
+ stdID(wxID_TOP);
+ stdID(wxID_INFO);
+ stdID(wxID_JUMP_TO);
+ stdID(wxID_NETWORK);
+ stdID(wxID_SELECT_COLOR);
+ stdID(wxID_SELECT_FONT);
+ stdID(wxID_SORT_ASCENDING);
+ stdID(wxID_SORT_DESCENDING);
+ stdID(wxID_SPELL_CHECK);
+ stdID(wxID_STRIKETHROUGH);
#undef stdID
}
// --------------- module and globals -----------------------------
+// normally we would do the cleanup from wxXmlResourceModule::OnExit() but it
+// can happen that some XRC records have been created because of the use of
+// XRCID() in event tables, which happens during static objects initialization,
+// but then the application initialization failed and so the wx modules were
+// neither initialized nor cleaned up -- this static object does the cleanup in
+// this case
+static struct wxXRCStaticCleanup
+{
+ ~wxXRCStaticCleanup() { CleanXRCID_Records(); }
+} s_staticCleanup;
+
class wxXmlResourceModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxXmlResourceModule)
{
delete wxXmlResource::Set(NULL);
if(wxXmlResource::ms_subclassFactories)
- WX_CLEAR_LIST(wxXmlSubclassFactoriesList, *wxXmlResource::ms_subclassFactories);
- wxDELETE(wxXmlResource::ms_subclassFactories);
+ {
+ for ( wxXmlSubclassFactories::iterator i = wxXmlResource::ms_subclassFactories->begin();
+ i != wxXmlResource::ms_subclassFactories->end(); ++i )
+ {
+ delete *i;
+ }
+ wxDELETE(wxXmlResource::ms_subclassFactories);
+ }
CleanXRCID_Records();
}
};
projects / wxWidgets.git / blobdiff